diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm index d9668cfa1e..3d3b917dea 100644 --- a/xCAT-server/lib/xcat/plugins/xnba.pm +++ b/xCAT-server/lib/xcat/plugins/xnba.pm @@ -400,7 +400,9 @@ sub _write_uefi_exit_script { open(my $ucfg, '>', "$bootloader_root/$node.uefi"); print $ucfg "#!gpxe\n"; print $ucfg "#$state\n" if $state; - print $ucfg "exit\n"; + # UEFI firmware stops at its boot manager menu when a boot option returns success. A + # failure status makes it try the next boot option, which is the disk. + print $ucfg "exit 1\n"; close($ucfg); } diff --git a/xCAT-test/unit/xnba_semicolon.t b/xCAT-test/unit/xnba_semicolon.t index fcbc39b951..b0203aca5b 100644 --- a/xCAT-test/unit/xnba_semicolon.t +++ b/xCAT-test/unit/xnba_semicolon.t @@ -106,7 +106,7 @@ for my $case ( 'elilo retains the command line'); } nodeset($node, 'boot', {}); - is(script("$node.uefi"), "#!gpxe\n#boot\nexit\n", 'local boot replaces stale UEFI install content'); + is(script("$node.uefi"), "#!gpxe\n#boot\nexit 1\n", 'local boot replaces stale UEFI install content'); nodeset($node, 'offline', {}); ok(!-e "$root/tftp/xcat/xnba/nodes/$node", 'offline removes BIOS script'); ok(!-e "$root/tftp/xcat/xnba/nodes/$node.uefi", 'offline removes UEFI script');