From bfb2e4291732aa28d89dad81cb7b22637355826a Mon Sep 17 00:00:00 2001 From: Pierre Neyron Date: Sun, 8 Nov 2020 10:23:48 +0100 Subject: [PATCH] [debian][centos] fix grub_cmdline_linux variable case --- from_scratch/base.yaml | 2 +- steps/setup/centos/configure_system.yaml | 6 +++--- steps/setup/debian/configure_system.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/from_scratch/base.yaml b/from_scratch/base.yaml index 4bdc40bd..777fdc46 100644 --- a/from_scratch/base.yaml +++ b/from_scratch/base.yaml @@ -82,7 +82,7 @@ global: zerofree: false # GRUB - GRUB_CMDLINE_LINUX: console=tty0 console=ttyS0,115200 + grub_cmdline_linux: console=tty0 console=ttyS0,115200 http_directory: $${kameleon_cwd}/http_dir http_pid: $${kameleon_cwd}/http.pid diff --git a/steps/setup/centos/configure_system.yaml b/steps/setup/centos/configure_system.yaml index 85b9f0ff..b875bfee 100644 --- a/steps/setup/centos/configure_system.yaml +++ b/steps/setup/centos/configure_system.yaml @@ -1,5 +1,5 @@ # System configuration -- GRUB_CMDLINE_LINUX: "" +- grub_cmdline_linux: "" # This will set the locals and the timezone - set_locales: @@ -69,6 +69,6 @@ - fix_NetworkManager_timeout: - exec_in: sed -i "s/--timeout=30/--timeout=50/" /usr/lib/systemd/system/NetworkManager-wait-online.service -- configure_GRUB: - - exec_in: sed -i 's|^\(GRUB_CMDLINE_LINUX=\).*|\1"$${GRUB_CMDLINE_LINUX}"|' /etc/default/grub +- configure_grub: + - exec_in: sed -i 's|^\(GRUB_CMDLINE_LINUX=\).*|\1"$${grub_cmdline_linux}"|' /etc/default/grub - exec_in: grub2-mkconfig -o "$(readlink -e /etc/grub2.cfg)" diff --git a/steps/setup/debian/configure_system.yaml b/steps/setup/debian/configure_system.yaml index 4111624d..252a310a 100644 --- a/steps/setup/debian/configure_system.yaml +++ b/steps/setup/debian/configure_system.yaml @@ -1,5 +1,5 @@ # System Config -- GRUB_CMDLINE_LINUX: "" +- grub_cmdline_linux: "" - configure_locales: # set locales programtically, based on http://linux.livejournal.com/1880366.html @@ -22,7 +22,7 @@ - /etc/initramfs-tools/conf.d/resume - RESUME=none -- configure_GRUB: - - exec_in: sed -i 's|^\(GRUB_CMDLINE_LINUX=\).*|\1"$${GRUB_CMDLINE_LINUX}"|' /etc/default/grub +- configure_grub: + - exec_in: sed -i 's|^\(GRUB_CMDLINE_LINUX=\).*|\1"$${grub_cmdline_linux}"|' /etc/default/grub - exec_in: update-grub