From e34b09df163aca1f9878040239370d8dabd0c02a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 7 Dec 2019 13:57:40 +0100
Subject: [serversetup-bwlp-ipxe] Fix initrd= command line for EFI

initrd=cpio1,cpio2 is syslinux syntax and not understood by the
kernel when booting in EFI mode. The proper way to this is
initrd=cpio1 initrd=cpio2 ...
---
 .../serversetup-bwlp-ipxe/inc/bootentry.inc.php            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
index dec70528..e89380ce 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php
@@ -308,13 +308,17 @@ class StandardBootEntry extends BootEntry
 			$script .= "-r ";
 		}
 		$script .= $entry->executable;
-		if (empty($initrds)) {
-			$rdBase = '';
-		} else {
-			$rdBase = " initrd=" . implode(',', $initrds);
+		if (!empty($initrds)) {
+			if ($mode === BootEntry::BIOS) {
+				$script .= " initrd=" . implode(',', $initrds);
+			} else {
+				foreach ($initrds as $initrd) {
+					$script .= " initrd=$initrd";
+				}
+			}
 		}
 		if (!empty($entry->commandLine)) {
-			$script .= "$rdBase {$entry->commandLine}";
+			$script .= ' ' . $entry->commandLine;
 		}
 		$script .= " || goto $failLabel\n";
 		if ($entry->resetConsole) {
-- 
cgit v1.2.3-55-g7522