summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2021-05-03 17:09:28 +0200
committerSimon Rettberg2021-05-03 17:09:28 +0200
commit503f7499dc688602b973d4950480279b11b44026 (patch)
tree03d6b75f1c528b05c0b90d8a64966f430fe64955
parent[minilinux] Remove debug log (diff)
downloadslx-admin-503f7499dc688602b973d4950480279b11b44026.tar.gz
slx-admin-503f7499dc688602b973d4950480279b11b44026.tar.xz
slx-admin-503f7499dc688602b973d4950480279b11b44026.zip
[serversetup-bwlp-ipxe] Add message when exiting from iPXE
-rw-r--r--modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php4
-rw-r--r--modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php
index b1d6562e..d4dd9516 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php
@@ -8,7 +8,7 @@ class Localboot
const BOOT_METHODS = [
'PCBIOS' => [
'EXIT' => 'set slx_exit 1 ||
-exit 1 ||',
+exit 1',
'COMBOOT' => 'set netX/209:string localboot.cfg ||
set netX/210:string http://${serverip}/tftp/sl-bios/ ||
chain -ar /tftp/sl-bios/lpxelinux.0',
@@ -16,7 +16,7 @@ chain -ar /tftp/sl-bios/lpxelinux.0',
],
'EFI' => [
'EXIT' => 'set slx_exit 1 ||
-exit 1 ||',
+exit 1',
'COMBOOT' => 'set netX/209:string localboot.cfg ||
set netX/210:string http://${serverip}/tftp/sl-efi64/ ||
chain -ar /tftp/sl-efi64/syslinux.efi',
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
index e44bce76..af7d0968 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
@@ -168,6 +168,8 @@ HERE;
console --left 60 --top 130 --right 67 --bottom 86 $slxConsoleUpdate ||
set slx_exit \${} ||
chain -a \${self}&entryid=\${selection} ||
+iseq \${slx_exit} \${} || console ||
+iseq \${slx_exit} \${} || echo Exiting with code \${slx_exit} ||
iseq \${slx_exit} \${} || exit \${slx_exit}
goto fail || goto start
goto \${target} ||