diff options
| author | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
| commit | 6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0 (patch) | |
| tree | 1b25330880065efa168cb5c69773d545df7cfc01 /modules-available/serversetup-bwlp-ipxe/api.inc.php | |
| parent | [locationinfo] add forward link to location module (diff) | |
| parent | [dozmod] Implement deleting orphaned files from vm store (diff) | |
| download | slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.gz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.xz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
merge branch 'master'
Diffstat (limited to 'modules-available/serversetup-bwlp-ipxe/api.inc.php')
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/api.inc.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/api.inc.php b/modules-available/serversetup-bwlp-ipxe/api.inc.php index 7575ad55..1ac885df 100644 --- a/modules-available/serversetup-bwlp-ipxe/api.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/api.inc.php @@ -19,9 +19,16 @@ $entry = MenuEntry::get($entryId); $data = $builder->getMenuEntry($entry); } else { + // Get bootstrap code if required... $data = $builder->bootstrapLive(); if ($data === false) { - $menu = IPxeMenu::forClient($builder->clientIp(), $builder->uuid()); + // ...otherwise, generate normal code + $menuId = Request::get('menuid', false, 'int'); + if ($menuId !== false) { + $menu = IPxeMenu::get($menuId, true); + } else { + $menu = IPxeMenu::forClient($builder->clientIp(), $builder->uuid()); + } $data = $builder->getMenu($menu, true); } } |