summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-03-26 12:02:57 +0100
committerSimon Rettberg2019-03-26 12:02:57 +0100
commitb3a3b56b7f2a9a9848397fea1ee657cf07b9e2e5 (patch)
tree05ba411724d0eced84e7b2480e4d5001056a1ccb
parent[locationinfo] Change glyphicons for panel list (diff)
downloadslx-admin-b3a3b56b7f2a9a9848397fea1ee657cf07b9e2e5.tar.gz
slx-admin-b3a3b56b7f2a9a9848397fea1ee657cf07b9e2e5.tar.xz
slx-admin-b3a3b56b7f2a9a9848397fea1ee657cf07b9e2e5.zip
[serversetup-bwlp-ipxe] Fix: Autoboot not working for chained menus
If chaining from one menu to another, the menu-with-single-entry autoboot rule would not work and yield a menu with a single item and no timeout. Fix the ipxe spaghetti code to do the right thing.
-rw-r--r--modules-available/serversetup-bwlp-ipxe/api.inc.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/api.inc.php b/modules-available/serversetup-bwlp-ipxe/api.inc.php
index 67da6727..9b52f333 100644
--- a/modules-available/serversetup-bwlp-ipxe/api.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/api.inc.php
@@ -79,6 +79,7 @@ if ($menu !== false) {
// If this is a menu with a single item, treat a timeout of 0 as "boot immediately" instead of "infinite"
if ($menu->itemCount() === 1 && $menu->timeoutMs() === 0 && ($tmp = $menu->getDefaultScriptLabel()) !== false) {
$directBoot = "goto $tmp ||";
+ $initLabel = 'init';
} else {
$directBoot = '';
}