From b476a91b5851767748d241af754cdfc782552d4d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 23 Feb 2024 17:02:05 +0100
Subject: [serversetup-bwlp-ipxe] Add initial support for GRUB menus

---
 modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php        | 5 ++++-
 .../serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
index 919861f0..5812c0cd 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
@@ -333,10 +333,13 @@ class CustomBootEntry extends BootEntry
 
 	public function toScript(ScriptBuilderBase $builder): string
 	{
+		// TODO: A (very) simple translator for oneliners like "poweroff || goto fail" maybe?
 		if ($builder instanceof ScriptBuilderIpxe)
 			return $this->ipxe;
 		if ($builder instanceof ScriptBuilderBash)
 			return $this->bash;
+		if ($builder instanceof ScriptBuilderGrub)
+			return $this->grub;
 		return '';
 	}
 
@@ -417,4 +420,4 @@ class SpecialBootEntry extends BootEntry
 
 	public function addFormFields(array &$array): void { }
 
-}
\ No newline at end of file
+}
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
index 4896f598..9421684f 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php
@@ -23,7 +23,7 @@ class ScriptBuilderIpxe extends ScriptBuilderBase
 
 	}
 
-	private function getUrlFull(?bool &$hasExt = null, string $key = null, string $value = null): string
+	private function getUrlFull(?bool &$hasExt = null, ?string $key = null, ?string $value = null): string
 	{
 		$url = parse_url($_SERVER['REQUEST_URI']);
 		$urlbase = $this->getUrlBase();
-- 
cgit v1.2.3-55-g7522