From 08a60c12d45286dc14cf6ad7de497550c1cab63f Mon Sep 17 00:00:00 2001 From: lgromero Date: Wed, 25 Jun 2025 16:32:43 +0200 Subject: [PATCH] refs #2321 removes ogdebug kernel param from controller and add it to oglive boot template --- CHANGELOG.md | 4 ++++ api/src/OgBootBundle/Controller/OgBootController.php | 2 +- tftpboot/ipxe_scripts/templates/oglive | 4 ++-- tftpboot/ipxe_scripts/templates/ogliveAdmin | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fda222d..c9dc7a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.8.7] - 2024-06-25 +### Changed +- Elimina el parámetro de kernel ogdebug del controlador y se le añade a las plantillas de arranque de oglive + ## [0.8.6] - 2024-06-24 ### Changed - Modifica la plantilla de arranque por disco y partición para no tener hardcodeado la partición EFI diff --git a/api/src/OgBootBundle/Controller/OgBootController.php b/api/src/OgBootBundle/Controller/OgBootController.php index f592159..c838f11 100644 --- a/api/src/OgBootBundle/Controller/OgBootController.php +++ b/api/src/OgBootBundle/Controller/OgBootController.php @@ -1590,7 +1590,7 @@ public function createBootFile(Request $request): JsonResponse } // Construcción de los argumentos del kernel - $kernelArgs = 'ro boot=oginit quiet splash irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogdebug=true ogtmpfs=15 ' . + $kernelArgs = 'ro boot=oginit quiet splash irqpoll acpi=on og2nd=sqfs ogprotocol=smb ogtmpfs=15 ' . 'oglivedir=${ISODIR}' . ' ' . 'LANG=' . $parameters['LANG'] . ' ' . 'ip=' . $parameters['ip'] . ':' . $serverIp . ':' . $parameters['router'] . ':' . $parameters['netmask'] . ':' . $parameters['computer_name'] . ':' . $parameters['netiface'] . ':none ' . diff --git a/tftpboot/ipxe_scripts/templates/oglive b/tftpboot/ipxe_scripts/templates/oglive index f9e1d8e..7962010 100644 --- a/tftpboot/ipxe_scripts/templates/oglive +++ b/tftpboot/ipxe_scripts/templates/oglive @@ -7,13 +7,13 @@ set default 0 set kernelargs __INFOHOST__ # Menú de entrada para seleccionar OgLive :try_iso -kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ${kernelargs} || goto fallback +kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogdebug=false ${kernelargs} || goto fallback initrd http://__SERVERIP__/tftpboot/${ISODIR}/oginitrd.img boot :fallback echo "OgLive default" set ISODIR ogLive -kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ${kernelargs} +kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogdebug=false ${kernelargs} initrd http://__SERVERIP__/tftpboot/${ISODIR}/oginitrd.img boot diff --git a/tftpboot/ipxe_scripts/templates/ogliveAdmin b/tftpboot/ipxe_scripts/templates/ogliveAdmin index 4be9a1d..430c185 100644 --- a/tftpboot/ipxe_scripts/templates/ogliveAdmin +++ b/tftpboot/ipxe_scripts/templates/ogliveAdmin @@ -7,13 +7,13 @@ set default 0 set kernelargs __INFOHOST__ # Menú de entrada para seleccionar OgLive :try_iso -kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogactiveadmin=true ${kernelargs} || goto fallback +kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogactiveadmin=true ogdebug=true ${kernelargs} || goto fallback initrd http://__SERVERIP__/tftpboot/${ISODIR}/oginitrd.img boot :fallback echo "OgLive default" set ISODIR ogLive -kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogactiveadmin=true ${kernelargs} +kernel http://__SERVERIP__/tftpboot/${ISODIR}/ogvmlinuz ogactiveadmin=true ogdebug=true ${kernelargs} initrd http://__SERVERIP__/tftpboot/${ISODIR}/oginitrd.img boot -- 2.40.1