From 12a94d672ba7077fe4a2e3d00bc953fa25ed5bb3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 15 Mar 2019 15:10:18 +0100
Subject: [serversetup-bwlp-ipxe] Change bwlp entry: Wrap logo in CPIO

Since ipxe won't wrap files in CPIO in EFI mode, wrap the logo in a cpio
on the server, since this works in both, BIOS and EFI mode.
---
 modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 6 +++---
 1 file changed, 3 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 537f0024..4c18b7d1 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php
@@ -299,10 +299,10 @@ class IPxe
 				'data' => json_encode([
 					'script' => '
 imgfree ||
-set slxextra ,logo ||
+set slxextra initrd=logo ||
 initrd /boot/default/initramfs-stage31 || goto fail
-initrd --name logo /tftp/bwlp.ppm.gz /etc/splash.ppm.gz || clear slxextra
-boot -a -r /boot/default/kernel initrd=initramfs-stage31${slxextra} slxbase=boot/default quiet splash loglevel=5 rd.systemd.show_status=auto intel_iommu=igfx_off ${ipappend1} ${ipappend2} || goto fail
+initrd --name logo /tftp/bwlp.cpio || clear slxextra
+boot -a -r /boot/default/kernel initrd=initramfs-stage31 ${slxextra} slxbase=boot/default quiet splash loglevel=5 rd.systemd.show_status=auto intel_iommu=igfx_off ${ipappend1} ${ipappend2} || goto fail
 ',
 				]),
 			]);
-- 
cgit v1.2.3-55-g7522