diff options
Diffstat (limited to 'modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php')
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php index 1b33a1ac..a6376b0e 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/scriptbuilderipxe.inc.php @@ -126,10 +126,8 @@ HERE; { if ($this->hasExtension) { $slxConsoleUpdate = '--update'; - $slxPasswordOnly = '--nouser'; } else { $slxConsoleUpdate = ''; - $slxPasswordOnly = ''; } $serverIp = $this->serverIp; @@ -258,19 +256,18 @@ HERE; if ($special === 'localboot') { // Get preferred localboot method, depending on system model // Check if required arguments are given; if not, spit out according script and chain to self - $uuid = Request::any('uuid', false, 'string'); // Get platform - EFI or PCBIOS $manuf = Request::any('manuf', false, 'string'); $product = Request::any('product', false, 'string'); - if ($uuid === false && $manuf === false && $product === false) { + if ($this->uuid === false && $manuf === false && $product === false) { return $this->redirect('special', 'localboot'); } $BOOT_METHODS = Localboot::BOOT_METHODS[$this->platform]; $localboot = false; $model = false; - if ($uuid !== false && Module::get('statistics') !== false) { + if ($this->uuid !== false && Module::get('statistics') !== false) { // If we have the machine table, we rather try to look up the system model from there, using the UUID - $row = Database::queryFirst('SELECT systemmodel FROM machine WHERE machineuuid = :uuid', ['uuid' => $uuid]); + $row = Database::queryFirst('SELECT systemmodel FROM machine WHERE machineuuid = :uuid', ['uuid' => $this->uuid]); if ($row !== false && !empty($row['systemmodel'])) { $model = $row['systemmodel']; } @@ -284,6 +281,7 @@ HERE; if (!empty($manuf)) { $model .= " ($manuf)"; } + $model = Util::ansiToUtf8($model); } } // Query |