Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8

This commit is contained in:
Jarrod Johnson 2013-10-23 11:03:17 -04:00
commit 93dd1e0e68

View File

@ -1374,6 +1374,7 @@ EOMS
print $inifile " exit\n";
print $inifile "fi\n";
print $inifile "\$NEWROOT/etc/init.d/localdisk\n"; # to run the localdisk
# udevd needed by s390x for networking
# but for other type of machine, udevd will affect the start of devices which detected
# after the chroot, so kill it before the switching root
@ -1382,7 +1383,6 @@ EOMS
}
print $inifile "cd /\n";
print $inifile "\$NEWROOT/etc/init.d/localdisk\n"; # to run the localdisk
print $inifile "mkdir \$NEWROOT/var/lib/dhcpcd/\n"; #neccessary for SLES11, not sure for SLES10
print $inifile "cp /var/lib/dhcpcd/* \$NEWROOT/var/lib/dhcpcd/\n";
print $inifile "cp /etc/resolv.conf \$NEWROOT/etc/\n";