diff options
| author | Simon Rettberg | 2019-03-19 16:28:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-19 16:28:05 +0100 |
| commit | 2c52f6fd139a83a38eba51a2bd3ab941c2343a6d (patch) | |
| tree | 48a38daf82395f784746dc48030e660fd4b7a658 | |
| parent | [statistics] Show error message if BIOS info fetching fails (diff) | |
| download | slx-admin-2c52f6fd139a83a38eba51a2bd3ab941c2343a6d.tar.gz slx-admin-2c52f6fd139a83a38eba51a2bd3ab941c2343a6d.tar.xz slx-admin-2c52f6fd139a83a38eba51a2bd3ab941c2343a6d.zip | |
[serversetup-bwlp-ipxe] Fix localboot detection for PXELinux import
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 4 | ||||
| -rw-r--r-- | 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() */ |