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

Undo the kexec attempts in nbroot, testing has uncovered severe hang situations that may occur, report back when packimage doesn't understand the method requested

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@543 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-02-21 20:09:41 +00:00
parent e96f522c60
commit 7528335082
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-nbroot/overlay/bin/dodestiny
View File

@ -97,6 +97,7 @@ while :; do
$TARG
fi
if [ $DESTINY == "install" -o $DESTINY == "netboot" ]; then
reboot -f #If script is here, kexec failed, reboot in case it wasn't a linux kernel and let the boot loader handle it instead
IMGSERVER=`grep imgserver /tmp/destiny | awk -F'>' '{print $2}'|awk -F'<' '{print $1}'`
INITRD=`grep initrd /tmp/destiny | awk -F'>' '{print $2}'|awk -F'<' '{print $1}'`
KERNEL=`grep kernel /tmp/destiny | awk -F'>' '{print $2}'|awk -F'<' '{print $1}'`
@ -107,7 +108,7 @@ while :; do
for mod in `lsmod|awk '{print $1}'|grep -v Module`; do
rmmod $mod
done
kexec -f --append="$KCMD" --initrd=/tmp/initrd /tmp/kernel
#kexec -f --append="$KCMD" --initrd=/tmp/initrd /tmp/kernel
reboot -f #If script is here, kexec failed, reboot in case it wasn't a linux kernel and let the boot loader handle it instead
fi
if [ $DEST == "runimage" ]; then

2
xCAT-server-2.0/lib/xcat/plugins/packimage.pm
View File

@ -76,6 +76,8 @@ sub process_request {
} elsif ($method =~ /squashfs/) {
$temppath = mkdtemp("/tmp/packimage.$$.XXXXXXXX");
$excludestr =~ s!-a \z!|cpio -dump $temppath!;
} else {
$callback->({error=>["Invalid method '$method' requested"],errorcode=>[1]});
}
if (! -d "$installroot/netboot/$osver/$arch/$profile/rootimg") {