diff options
| author | Simon Rettberg | 2019-04-03 16:34:03 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-04-03 16:34:03 +0200 |
| commit | 8fcede96bad16f36f4d104e6ea16b203f724c114 (patch) | |
| tree | a6d216df66f1ba4af4c181d5741157ca1ad87b32 | |
| parent | [locationinfo] Style checkboxes, use icon in save button (diff) | |
| download | slx-admin-8fcede96bad16f36f4d104e6ea16b203f724c114.tar.gz slx-admin-8fcede96bad16f36f4d104e6ea16b203f724c114.tar.xz slx-admin-8fcede96bad16f36f4d104e6ea16b203f724c114.zip | |
[serversetup-bwlp-ipxe] Fix resetting of default bootentries on install
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 3 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/install.inc.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php index 856ecfb5..7c5f13ec 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php @@ -105,7 +105,8 @@ class IPxe public static function importLegacyMenu($force = false) { - if (!$force && false !== Database::queryFirst("SELECT entryid FROM serversetup_bootentry WHERE entryid = 'bwlp-default'")) + // See if anything is there + if (!$force && false !== Database::queryFirst("SELECT menuentryid FROM serversetup_menuentry LIMIT 1")) return false; // Already exists // Now create the default entry self::createDefaultEntries(); diff --git a/modules-available/serversetup-bwlp-ipxe/install.inc.php b/modules-available/serversetup-bwlp-ipxe/install.inc.php index dc6d145e..35eeee37 100644 --- a/modules-available/serversetup-bwlp-ipxe/install.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/install.inc.php @@ -110,6 +110,8 @@ if (Module::get('location') !== false) { } } -IPxe::createDefaultEntries(); +if (Module::isAvailable('serversetup')) { + IPxe::createDefaultEntries(); +} responseFromArray($res); |