arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed nfs mount problem and bug:CN fail to acquire eth address during deployment(ID: 3515413)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12207 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
immarvin
2012-04-12 03:07:08 +00:00
parent 57518648b9
commit 8112759c2f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-server/share/xcat/netboot/sles/genimage
View File

@@ -957,7 +957,7 @@ fi
export IFACE=\$IFACE
/usr/bin/touch /var/lib/dhcpcd/dhcpcd-$IFACE.info
/usr/bin/touch /var/lib/dhcpcd/dhcpcd-\$IFACE.info
netstart \$IFACE
while ! ifconfig | grep inet; do
@@ -1305,6 +1305,14 @@ END
}
}
#copy conf files needed by nfs mount in sles11.2
if($osver_host == 11)
{
system("cp -r $rootimg_dir/etc/protocols /tmp/xcatinitrd.$$/etc/");
system("cp -r $rootimg_dir/etc/netconfig /tmp/xcatinitrd.$$/etc/");
}
# Copy udev libraries
system("mkdir -p /tmp/xcatinitrd.$$/etc/udev");
system("mkdir -p /tmp/xcatinitrd.$$/lib/firmware");
@@ -1316,18 +1324,18 @@ END
system("cp -r $rootimg_dir/usr/bin/killall /tmp/xcatinitrd.$$/usr/bin");
# Copy rules for network adapter
my $name = `cat /etc/sysconfig/network/ifcfg-$prinic | grep NAME`;
my $nic = '';
if ($name =~ m/(\d+\.\d+\.\d+)/g) {
$nic = $&;
}
#my $name = `cat /etc/sysconfig/network/ifcfg-$prinic | grep NAME`;
#my $nic = '';
#if ($name =~ m/(\d+\.\d+\.\d+)/g) {
# $nic = $&;
#}
# Somehow checking for *$nic.rules does not work
#if ( -f "/etc/udev/rules.d/*$nic.rules" ) {
system("cp -r /etc/udev/rules.d/*$nic.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
# system("cp -r /etc/udev/rules.d/*$nic.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
#}
#if ( -f "/etc/udev/rules.d/*persistent-net.rules" ) {
system("cp -r /etc/udev/rules.d/*persistent-net.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
# system("cp -r /etc/udev/rules.d/*persistent-net.rules /tmp/xcatinitrd.$$/etc/udev/rules.d");
#}
system("mkdir -p /tmp/xcatinitrd.$$/lib/udev");