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

-Fix errors in BOOTIF handling and RHEL5 stateless/statelite image network bringup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7577 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-09-22 15:08:16 +00:00
parent 64b4e85ddc
commit ed66c9013c
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -939,18 +939,12 @@ for i in `cat /proc/cmdline`; do
if [ "\$KEY" == 'netdev' ]; then
NETDEV=`echo \$i |awk -F= '{print \$2}'`
elif [ "\$KEY" == 'BOOTIF' ]; then
VALUE=`echo \$i |awk -F= '{print \$2}'`
BOOTIF=`ifconfig -a|grep -i "hwaddr $VALUE"|awk '{print $1}'`
if [ ! -z "\$XCATSERVER" ]; then
break
fi
VALUE=`echo \$i |awk -F= '{print \$2}'|sed -e s/^01-// -e s/-/:/g`
BOOTIF=`ifconfig -a|grep -i "hwaddr \$VALUE"|awk '{print \$1}'`
elif [ "\$KEY" == 'XCAT' ]; then
VALUE=`echo \$i |awk -F= '{print \$2}'`
# format: XCAT=xcatmaster:3001
XCATSERVER=\$VALUE
if [ ! -z "\$BOOTIF" ]; then
break
fi
fi
done
@ -970,11 +964,11 @@ fi
export IFACE=\$IFACE
netstart \$IFACE
netstart
while ! ifconfig | grep inet; do
echo -e "\${RED}Failed to acquire address, retrying \${RESET}"
sleep 5
netstart \$IFACE
netstart
done
ifconfig lo 127.0.0.1
ifconfig lo up
@ -1225,7 +1219,7 @@ EOMS
open($inifile,">"."/tmp/xcatinitrd.$$/bin/netstart");
print $inifile "#!/sbin/nash\n";
print $inifile "network --device \${1} --bootproto dhcp\n";
print $inifile "network --device \$IFACE --bootproto dhcp\n";
close($inifile);
chmod(0755,"/tmp/xcatinitrd.$$/init");
chmod(0755,"/tmp/xcatinitrd.$$/bin/netstart");

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

@ -893,18 +893,12 @@ for i in `cat /proc/cmdline`; do
if [ "\$KEY" == 'netdev' ]; then
NETDEV=`echo \$i |awk -F= '{print \$2}'`
elif [ "\$KEY" == 'BOOTIF' ]; then
VALUE=`echo \$i |awk -F= '{print \$2}'`
BOOTIF=`ifconfig -a|grep -i "hwaddr $VALUE"|awk '{print $1}'`
if [ ! -z "\$XCATSERVER" ]; then
break
fi
VALUE=`echo \$i |awk -F= '{print \$2}'|sed -e s/^01-// -e s/-/:/g`
BOOTIF=`ifconfig -a|grep -i "hwaddr \$VALUE"|awk '{print \$1}'`
elif [ "\$KEY" == 'XCAT' ]; then
VALUE=`echo \$i |awk -F= '{print \$2}'`
# format: XCAT=xcatmaster:xcatdport
XCATSERVER=\$VALUE
if [ ! -z "\$BOOTIF" ]; then
break
fi
fi
done