From 6313d3f09c09fd9d0d4346743c1b3fb7769434a2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 31 Jan 2023 14:13:42 +0100
Subject: [serversetup-bwlp-ipxe] Add error handling, remove dead code

---
 .../inc/scriptbuilderipxe.inc.php                  | 48 ++++------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

(limited to 'modules-available/serversetup-bwlp-ipxe/inc')

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
index 9165b293..3ca312aa 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
@@ -136,13 +136,13 @@ HERE;
 imgstat bg-menu || imgfetch --name bg-menu /tftp/pxe-menu.png ||
 console --left 55 --top 88 --right 63 --bottom 64 --keep --picture bg-menu ||
 
-colour --rgb 0xffffff 7
-colour --rgb 0xcccccc 5
-colour --rgb 0x000000 0
-colour --rgb 0xdddddd 6
-cpair --foreground 0 --background 4 1
-cpair --foreground 0 --background 5 2
-cpair --foreground 7 --background 9 0
+colour --rgb 0xffffff 7 ||
+colour --rgb 0xcccccc 5 ||
+colour --rgb 0x000000 0 ||
+colour --rgb 0xdddddd 6 ||
+cpair --foreground 0 --background 4 1 ||
+cpair --foreground 0 --background 5 2 ||
+cpair --foreground 7 --background 9 0 ||
 
 :slx_menu
 
@@ -183,40 +183,6 @@ prompt Boot failed. Press any key to start.
 goto start
 
 HERE;
-
-		/*
-
-		:i5
-		chain -a /tftp/memtest.0 passes=1 onepass || goto membad
-		prompt Memory OK. Press a key.
-		goto init
-
-		:i8
-		set x:int32 0
-		:again
-		console --left 60 --top 130 --right 67 --bottom 96 --picture bg-load --keep ||
-		console --left 55 --top 88 --right 63 --bottom 64 --picture bg-menu --keep ||
-		inc x
-		iseq \${x} 20 || goto again
-		prompt DONE. Press dein Knie.
-		goto slx_menu
-
-		:membad
-		iseq \${errno} 0x1 || goto memaborted
-		params
-		param scrot \${vram}
-		imgfetch -a http://132.230.8.113/screen.php##params ||
-		prompt Memory is bad. Press a key.
-		goto init
-
-		:memaborted
-		params
-		param scrot \${vram}
-		imgfetch -a http://132.230.8.113/screen.php##params ||
-		prompt Memory test aborted. Press a key.
-		goto init
-
-		*/
 		return $output;
 	}
 
-- 
cgit v1.2.3-55-g7522