xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 19:32:31 +00:00
Code Issues Releases Wiki Activity

Allow SLES15 node on Power to reboot in standby mode

Browse Source
This commit is contained in:
Mark Gurevich
2022-03-24 14:32:36 -04:00
parent 60b927285f
commit 0031526112
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/grub2.pm
View File

@@ -100,7 +100,8 @@ sub setstate {
my $tftpdir = shift;
my %nrhash = %{ shift() };
my $linuximghash = shift();
my $nodearch = shift;
my $nodearch = shift;
my $nodeos = shift;
my $kern = $bphash{$node}->[0]; #$bptab->getNodeAttribs($node,['kernel','initrd','kcmdline']);
if ($kern->{kcmdline} =~ /!myipfn!/) {
my $ipfn;
@@ -284,6 +285,8 @@ sub setstate {
chdir("$bootloader_root");
if ($cref->{currstate} eq "offline" or $cref->{currstate} eq "boot") {
unlink("grub2-$node");
} elsif ($cref->{currstate} eq "standby" and $nodeos =~ /^sle15/i) {
unlink("grub2-$node"); #Make sure SLES15 can still boot from disk in "standby" state
} elsif (! -e "grub2-$node") {
symlink("grub2." . $nodearch, "grub2-$node");
}
@@ -751,13 +754,14 @@ sub process_request {
if ($args[0]) { # Send it on to the destiny plugin, then setstate
my $ent = $typehash->{$_}->[0];
my $nodearch = $ent->{'arch'};
my $nodeos = $ent->{'os'};
my $osimgname = $ent->{'provmethod'};
my $linuximghash = undef;
unless ($osimgname =~ /^(install|netboot|statelite)$/) {
$linuximghash = $linuximgtab->getAttribs({ imagename => $osimgname }, 'boottarget', 'addkcmdline');
}
($rc, $errstr) = setstate($_, \%bphash, $chainhash, $machash, $tftpdir, $nrhash, $linuximghash, $nodearch);
($rc, $errstr) = setstate($_, \%bphash, $chainhash, $machash, $tftpdir, $nrhash, $linuximghash, $nodearch, $nodeos);
if ($rc) {
$response{node}->[0]->{errorcode}->[0] = $rc;
$response{node}->[0]->{error}->[0] = $errstr;

9
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
View File

@@ -71,12 +71,15 @@ cmd:lsdef -l $$CN
cmd:ping $$CN -c 3
check:rc==0
check:output=~64 bytes from $$CN
# Check node ends up in boot state
cmd:lsdef $$CN -i currstate -c
check:output==boot
cmd:xdsh $$CN "cat /var/log/xcat/xcat.log"
cmd:xdsh $$CN "cat /test.synclist"
check:rc==0
# Check node can be rebooted from disk
cmd:xdsh $$CN shutdown -r now
cmd:sleep 300
cmd:xdsh $$CN uptime
check:rc==0
check:output=~up
cmd:if [ -x /usr/bin/goconserver ]; then makegocons -d $$CN; else makeconservercf -d $$CN; fi
cmd:if [[ -f /test.synclist.bak ]] ;then mv -f /test.synclist.bak /tmp/test.synclist;else rm -rf /test.synclist;fi
cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=

9
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
View File

@@ -107,7 +107,10 @@ check:rc==0
cmd:sitetz=`lsdef -t site -i timezone | awk -F= '{print $2}'`;nodetz=`xdsh $$CN "timedatectl | grep 'Time zone'" | awk -F: '{print $3}' | awk '{print $1}'`; test $sitetz = $nodetz
check:rc==0
# Check node ends up in boot state
cmd:lsdef $$CN -i currstate -c
check:output==boot
# Check node can be rebooted from disk
cmd:xdsh $$CN shutdown -r now
cmd:sleep 300
cmd:xdsh $$CN uptime
check:rc==0
check:output=~up
end