diff options
| author | Simon Rettberg | 2019-03-09 16:19:54 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-09 16:19:54 +0100 |
| commit | b7ffb7a9e6bec50dbe28a95d9140de076e7781c7 (patch) | |
| tree | fca7d985139273e030fb00a3d896459e7aa34dab | |
| parent | [statistics] Fix: runmode-nonclient always showing as occupied in list (diff) | |
| download | slx-admin-b7ffb7a9e6bec50dbe28a95d9140de076e7781c7.tar.gz slx-admin-b7ffb7a9e6bec50dbe28a95d9140de076e7781c7.tar.xz slx-admin-b7ffb7a9e6bec50dbe28a95d9140de076e7781c7.zip | |
[serversetup-bwlp-ipxe/locations] Minor fixes
| -rw-r--r-- | modules-available/locations/templates/locations.html | 2 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php | 7 | ||||
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/page.inc.php | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 038a69c8..a2d6cafc 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -43,7 +43,7 @@ </tr> {{#list}} <tr> - <td> + <td class="text-nowrap"> <div style="display:inline-block;width:{{depth}}em"></div> {{#show-only}} <span>{{locationname}}</span> diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php index e11c1a89..537f0024 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxe.inc.php @@ -314,12 +314,13 @@ boot -a -r /boot/default/kernel initrd=initramfs-stage31${slxextra} slxbase=boot 'hotkey' => 'D', 'title' => 'bwLehrpool-Umgebung starten (nosplash, debug)', 'data' => json_encode([ - 'executable' => '/boot/default/kernel', - 'initRd' => '/boot/default/initramfs-stage31', - 'commandLine' => 'slxbase=boot/default loglevel=7 intel_iommu=igfx_off ${ipappend1} ${ipappend2}', + 'executable' => ['PCBIOS' => '/boot/default/kernel'], + 'initRd' => ['PCBIOS' => ['/boot/default/initramfs-stage31']], + 'commandLine' => ['PCBIOS' => 'slxbase=boot/default loglevel=7 intel_iommu=igfx_off ${ipappend1} ${ipappend2}'], 'replace' => true, 'autoUnload' => true, 'resetConsole' => true, + 'arch' => 'agnostic', ]), ]); Database::exec($query, diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 95ebb69f..4941a44b 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -297,6 +297,11 @@ class Page_ServerSetup extends Page $bootentryTable[] = $row; } + if (empty($bootentryTable)) { + IPxe::importLegacyMenu(true); + Util::redirect('?do=serversetup&show=bootentry'); + } + Render::addTemplate('bootentry-list', array( 'bootentryTable' => $bootentryTable, 'allowEdit' => $allowEdit, |