From a7ec0aeeebd64779a7218600cdfd27cd689084c2 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Aug 2019 09:26:12 +0200 Subject: [PATCH 1/2] Revert "mxgrub: Log to ttyS0 as well" This reverts commit 17202cfd9f2a677c36be744d65f7e90efbf854c0. The kernel doesn't support logging to multiple serial consoles at the same time. --- mxgrub/mxgrub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxgrub/mxgrub b/mxgrub/mxgrub index d88b79c..626b2ab 100755 --- a/mxgrub/mxgrub +++ b/mxgrub/mxgrub @@ -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=ttyS0,115200n8 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 crashkernel=256M root=LABEL=root ro console=ttyS1,115200n8 console=tty0 init=/bin/systemd audit=0 ; initrd /boot/grub/initramfs.igz }\n"; } my $GRUB_CFG_NEW=<<"EOF"; From 2d39aef501b16aac77a8a4389ce8cec0a7be5030 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 8 Aug 2019 09:29:09 +0200 Subject: [PATCH 2/2] Revert "crashkernel: Add ttyS0 console" This reverts commit 7ba29f13d1ad07ec3c2d06c2394e377fc1d5ab6c. The kernel doesn't support logging to multiple serial consoles at the same time. --- misc_systemd_units/crashkernel.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc_systemd_units/crashkernel.service b/misc_systemd_units/crashkernel.service index 26695c0..6f4a92a 100644 --- a/misc_systemd_units/crashkernel.service +++ b/misc_systemd_units/crashkernel.service @@ -6,7 +6,7 @@ ConditionPathExists=/boot/bzImage.crash StandardOutput=kmsg StandardError=kmsg Type=oneshot -ExecStart=/usr/sbin/kexec -p /boot/bzImage.crash --initrd=/boot/grub/initramfs.igz --command-line="root=LABEL=root ro console=ttyS0,115200n8 console=ttyS1,115200n8 console=tty0 irqpoll maxcpus=1 reset_devices CRASH" +ExecStart=/usr/sbin/kexec -p /boot/bzImage.crash --initrd=/boot/grub/initramfs.igz --command-line="root=LABEL=root ro console=ttyS1,115200n8 console=tty0 irqpoll maxcpus=1 reset_devices CRASH" ExecStop=/usr/sbin/kexec -p -u RemainAfterExit=yes