From b7ffb7a9e6bec50dbe28a95d9140de076e7781c7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 9 Mar 2019 16:19:54 +0100
Subject: [serversetup-bwlp-ipxe/locations] Minor fixes

---
 modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 7 ++++---
 modules-available/serversetup-bwlp-ipxe/page.inc.php     | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
index e11c1a89..537f0024 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
@@ -314,12 +314,13 @@ boot -a -r /boot/default/kernel initrd=initramfs-stage31${slxextra} slxbase=boot
 				'hotkey' => 'D',
 				'title' => 'bwLehrpool-Umgebung starten (nosplash, debug)',
 				'data' => json_encode([
-					'executable' => '/boot/default/kernel',
-					'initRd' => '/boot/default/initramfs-stage31',
-					'commandLine' => 'slxbase=boot/default loglevel=7 intel_iommu=igfx_off ${ipappend1} ${ipappend2}',
+					'executable' => ['PCBIOS' => '/boot/default/kernel'],
+					'initRd' => ['PCBIOS' => ['/boot/default/initramfs-stage31']],
+					'commandLine' => ['PCBIOS' => 'slxbase=boot/default loglevel=7 intel_iommu=igfx_off ${ipappend1} ${ipappend2}'],
 					'replace' => true,
 					'autoUnload' => true,
 					'resetConsole' => true,
+					'arch' => 'agnostic',
 				]),
 			]);
 		Database::exec($query,
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 95ebb69f..4941a44b 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -297,6 +297,11 @@ class Page_ServerSetup extends Page
 			$bootentryTable[] = $row;
 		}
 
+		if (empty($bootentryTable)) {
+			IPxe::importLegacyMenu(true);
+			Util::redirect('?do=serversetup&show=bootentry');
+		}
+
 		Render::addTemplate('bootentry-list', array(
 			'bootentryTable' => $bootentryTable,
 			'allowEdit' => $allowEdit,
-- 
cgit v1.2.3-55-g7522