From 2c52f6fd139a83a38eba51a2bd3ab941c2343a6d Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 19 Mar 2019 16:28:05 +0100 Subject: [serversetup-bwlp-ipxe] Fix localboot detection for PXELinux import --- modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 4 ++-- modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php index 9f7232a3..dc90ea07 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php @@ -244,8 +244,8 @@ class IPxe public static function importPxeMenuEntries($pxe, &$menuEntries, &$defaultLabel) { foreach ($pxe->sections as $section) { - if ($section->localBoot || preg_match('/chain\.c32$/i', $section->kernel)) { - $menuEntries['localboot'] = 'localboot'; + if ($section->localBoot !== false || preg_match('/chain\.c32$/i', $section->kernel)) { + $menuEntries['localboot'] = $section; continue; } if ($section->label === null) { diff --git a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php index 82e36afc..a3826c2e 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php @@ -255,9 +255,9 @@ class PxeSection */ public $isDisabled = false; /** - * @var int Value of the LOCALBOOT field + * @var int|false Value of the LOCALBOOT field, false if not set */ - public $localBoot; + public $localBoot = false; /** * @var string hotkey to trigger item. Only valid after calling mangle() */ -- cgit v1.2.3-55-g7522