Changeset 3053 in /cluster/svnroot


Ignore:
Timestamp:
Mar 6, 2011 9:02:40 AM (10 years ago)
Author:
fitz
Message:

Merge #610 and #611 for milestone:3.0.3

Location:
bccd-ng/branches/rc-3.0.3
Files:
2 edited
4 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/rc-3.0.3/bin/build_livecd.pl

    r3041 r3053  
    742742
    743743# Needed down here to prevent hang with debconf
    744 foreach my $file ( "exports", "hosts.equiv", "gpm.conf", "inittab" ) {
     744foreach my $file ( "exports", "hosts.equiv", "gpm.conf", "inittab",
     745                                   "pdnsd.conf", "default/pdnsd", ) {
    745746    $Bccd->run_test(
    746747        "revfetch",
     
    11441145    "Requiring bccd nic start script for networking start.",
    11451146    "perl -wpli -e 's/^(#\\s+Required-Start:\\s+.*\$)/\$1 bccd-nics/' $BUILDDIR/etc/init.d/networking",
    1146     );
    1147 
    1148 $Bccd->run_test(
    1149     "system",
    1150     "",
    1151     "Allowing pdnsd to listen on all interfaces.",
    1152     "perl -wpli -e 's!(server_ip = )!// \$1!g' $BUILDDIR/usr/share/pdnsd/pdnsd-resolvconf.conf",
    11531147    );
    11541148
  • bccd-ng/branches/rc-3.0.3/packages/etc/init.d/bccd-networking

    r2749 r3053  
    6161                fi
    6262        done
     63        if [[ "`hostname`" =~ node000 ]]; then
     64                /bin/sed -i -e 's!START_DAEMON=no!START_DAEMON=yes!g' /etc/default/pdnsd
     65        fi
    6366        ;;
    6467    *)
Note: See TracChangeset for help on using the changeset viewer.