From 503f7499dc688602b973d4950480279b11b44026 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 May 2021 17:09:28 +0200
Subject: [serversetup-bwlp-ipxe] Add message when exiting from iPXE

---
 modules-available/serversetup-bwlp-ipxe/inc/localboot.inc.php         | 4 ++--
 modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php | 2 ++
 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} ||
-- 
cgit v1.2.3-55-g7522