From d1a89dcf0afd4fb64b9b94549e45b9b0e393c4be Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 12 Aug 2019 11:44:02 +0200 Subject: [PATCH] mxgrub: use $KERNEL_PARAMETER everywhere The variable $KERNEL_PARAMETER is supposed to be used everywhere a kernel command line is build. One site was overlooked, so use it there, too. Also remove ttyS0 from KERNEL_PARAMETER, which doesn't work. --- mxgrub/mxgrub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mxgrub/mxgrub b/mxgrub/mxgrub index 7e96993..4d354c4 100755 --- a/mxgrub/mxgrub +++ b/mxgrub/mxgrub @@ -239,7 +239,7 @@ sub scan_mariux { } } -our $KERNEL_PARAMETER="ro crashkernel=512M console=ttyS0,115200n8 console=ttyS1,115200n8 console=tty0 init=/bin/systemd audit=0"; +our $KERNEL_PARAMETER="ro crashkernel=512M console=ttyS1,115200n8 console=tty0 init=/bin/systemd audit=0"; sub update_grub_cfg { my $kernellist=''; @@ -248,7 +248,7 @@ sub update_grub_cfg { for my $label (@MARIUX) { my $image=label_to_image($label); - $kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image crashkernel=256M root=LABEL=root ro console=ttyS1,115200n8 console=tty0 init=/bin/systemd audit=0 ; initrd /boot/grub/initramfs.igz }\n"; + $kernellist.="\tmenuentry \"$label\" --unrestricted { save_env chosen ; linux /boot/$image root=LABEL=root $KERNEL_PARAMETER ; initrd /boot/grub/initramfs.igz }\n"; } my $GRUB_CFG_NEW=<<"EOF";