diff options
| author | Simon Rettberg | 2021-04-27 16:14:45 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-04-27 16:14:45 +0200 |
| commit | 896772e3e6b48cd6f2a168b6f5a379267c782779 (patch) | |
| tree | f1d7ff519e642873f4b82739c1c5624120160060 | |
| parent | [rebootcontrol] Simple support for displaying SVG from stdout (diff) | |
| download | slx-admin-896772e3e6b48cd6f2a168b6f5a379267c782779.tar.gz slx-admin-896772e3e6b48cd6f2a168b6f5a379267c782779.tar.xz slx-admin-896772e3e6b48cd6f2a168b6f5a379267c782779.zip | |
[serversetup-bwlp-ipxe] Fix localboot via exit
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php | 6 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php | 2 |
2 files changed, 6 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 4203f931..b1d6562e 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php @@ -7,14 +7,16 @@ class Localboot const BOOT_METHODS = [ 'PCBIOS' => [ - 'EXIT' => 'exit 1', + 'EXIT' => 'set slx_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', 'SANBOOT' => 'sanboot --no-describe', ], 'EFI' => [ - 'EXIT' => 'exit 1', + 'EXIT' => 'set slx_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 385cd15f..e44bce76 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php @@ -166,7 +166,9 @@ HERE; $output .= " selection || goto default || goto fail\n"; $output .= <<<HERE console --left 60 --top 130 --right 67 --bottom 86 $slxConsoleUpdate || +set slx_exit \${} || chain -a \${self}&entryid=\${selection} || +iseq \${slx_exit} \${} || exit \${slx_exit} goto fail || goto start goto \${target} || echo Could not find menu entry in script. |