opengnsys
/
ogboot
2
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

refs #1167 #1168 #1169 #1170 put basename if i receive a directory in oglivedir and removes all ports in parameter kernel

ogboot-log
Luis Gerardo Romero Garcia 2024-11-22 13:30:05 +01:00
parent b798464c84
commit 8183050f7e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/OgBootBundle/Controller/OgBootController.php
View File

@ -1050,6 +1050,7 @@ public function createBootFile(Request $request): JsonResponse
); );
} }
// Parámetros opcionales // Parámetros opcionales
$parameters = [ $parameters = [
'LANG' => $data['lang'] ?? 'es_ES.UTF-8', 'LANG' => $data['lang'] ?? 'es_ES.UTF-8',
@ -1059,11 +1060,11 @@ public function createBootFile(Request $request): JsonResponse
'computer_name' => $data['computer_name'] ?? '', 'computer_name' => $data['computer_name'] ?? '',
'netiface' => $data['netiface'] ?? '', 'netiface' => $data['netiface'] ?? '',
'group' => $data['group'] ?? '', 'group' => $data['group'] ?? '',
'ogrepo' => $data['ogrepo'] ?? '', 'ogrepo' => isset($data['ogrepo']) ? explode(':', $data['ogrepo'])[0] : '',
'ogcore' => $data['ogcore'] ?? '', 'ogcore' => isset($data['ogcore']) ? explode(':', $data['ogcore'])[0] : '',
'oglive' => $data['oglive'] ?? $serverIp, 'oglive' => isset($data['oglive']) ? explode(':', $data['oglive'])[0] : $serverIp,
'oglog' => $data['oglog'] ?? $serverIp, 'oglog' => isset($data['oglog']) ? explode(':', $data['oglog'])[0] : $serverIp,
'ogshare' => $data['ogshare'] ?? $serverIp, 'ogshare' => isset($data['ogshare']) ? explode(':', $data['ogshare'])[0] : $serverIp,
'oglivedir' => $data['oglivedir'] ?? '', 'oglivedir' => $data['oglivedir'] ?? '',
'ogprof' => $data['ogprof'] ?? 'false', 'ogprof' => $data['ogprof'] ?? 'false',
'hardprofile' => $data['hardprofile'] ?? '', 'hardprofile' => $data['hardprofile'] ?? '',
@ -1113,7 +1114,10 @@ public function createBootFile(Request $request): JsonResponse
if (!empty($this->ogBootPort)) { if (!empty($this->ogBootPort)) {
$serverIpPort .= ':' . $this->ogBootPort; $serverIpPort .= ':' . $this->ogBootPort;
} }
// Extraer solo el nombre del directorio si contiene una ruta completa PROVISIONAL
if (strpos($ogLiveDir, '/') !== false) {
$ogLiveDir = basename($ogLiveDir);
}
$pxeContent = str_replace( $pxeContent = str_replace(
['__INFOHOST__', '__SERVERIP__', '__OGLIVE__'], ['__INFOHOST__', '__SERVERIP__', '__OGLIVE__'],
[$kernelArgs, $serverIpPort, $ogLiveDir], [$kernelArgs, $serverIpPort, $ogLiveDir],