diff options
| author | Simon Rettberg | 2019-12-07 13:58:07 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-12-07 13:58:07 +0100 |
| commit | ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1 (patch) | |
| tree | c24312046c8a9572819d5668b1ba9ce6d9b0e2c1 /modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php | |
| parent | [statistics/rebootcontrol] Add WOL button to statistics module (diff) | |
| parent | [sysconfig] Display error if deleting config from database failed (diff) | |
| download | slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.tar.gz slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.tar.xz slx-admin-ea01e0f82aefe38b9d08ddf2eeb6fc5f059dc2e1.zip | |
Merge branch 'master' into wol
Diffstat (limited to 'modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php')
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php index dec70528..e89380ce 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentry.inc.php @@ -308,13 +308,17 @@ class StandardBootEntry extends BootEntry $script .= "-r "; } $script .= $entry->executable; - if (empty($initrds)) { - $rdBase = ''; - } else { - $rdBase = " initrd=" . implode(',', $initrds); + if (!empty($initrds)) { + if ($mode === BootEntry::BIOS) { + $script .= " initrd=" . implode(',', $initrds); + } else { + foreach ($initrds as $initrd) { + $script .= " initrd=$initrd"; + } + } } if (!empty($entry->commandLine)) { - $script .= "$rdBase {$entry->commandLine}"; + $script .= ' ' . $entry->commandLine; } $script .= " || goto $failLabel\n"; if ($entry->resetConsole) { |