diff --git a/live/config-cdroot/fix_bootconfig.aarch64 b/live/config-cdroot/fix_bootconfig.aarch64 index 2deb71fc8a..f53a3afd68 100755 --- a/live/config-cdroot/fix_bootconfig.aarch64 +++ b/live/config-cdroot/fix_bootconfig.aarch64 @@ -80,21 +80,21 @@ terminal_output gfxterm menuentry "Install $label" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} loglevel=4 + linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} echo Loading initrd... initrd (\$root)/boot/aarch64/loader/initrd } menuentry "Failsafe -- Install $label" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} loglevel=4 ide=nodma apm=off noresume edd=off nomodeset 3 + linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3 echo Loading initrd... initrd (\$root)/boot/aarch64/loader/initrd } menuentry "Check Installation Medium" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/aarch64/loader/linux loglevel=4 mediacheck=1 plymouth.enable=0 \${isoboot} + linux (\$root)/boot/aarch64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot} echo Loading initrd... initrd (\$root)/boot/aarch64/loader/initrd } diff --git a/live/config-cdroot/fix_bootconfig.ppc64le b/live/config-cdroot/fix_bootconfig.ppc64le index 2bf06bff60..348c2de666 100755 --- a/live/config-cdroot/fix_bootconfig.ppc64le +++ b/live/config-cdroot/fix_bootconfig.ppc64le @@ -97,14 +97,14 @@ fi menuentry "Install $label" --class os --unrestricted { echo 'Loading kernel...' - linux /boot/ppc64le/linux loglevel=4 + linux /boot/ppc64le/linux echo 'Loading initrd...' initrd /boot/ppc64le/initrd } menuentry "Check Installation Medium" --class os --unrestricted { echo 'Loading kernel...' - linux /boot/ppc64le/linux loglevel=4 mediacheck=1 plymouth.enable=0 + linux /boot/ppc64le/linux mediacheck=1 plymouth.enable=0 echo 'Loading initrd...' initrd /boot/ppc64le/initrd } diff --git a/live/config-cdroot/fix_bootconfig.x86_64 b/live/config-cdroot/fix_bootconfig.x86_64 index a81b98159a..82e60beb2d 100755 --- a/live/config-cdroot/fix_bootconfig.x86_64 +++ b/live/config-cdroot/fix_bootconfig.x86_64 @@ -80,21 +80,21 @@ terminal_output gfxterm menuentry "Install $label" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} loglevel=4 + linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} echo Loading initrd... initrd (\$root)/boot/x86_64/loader/initrd } menuentry "Failsafe -- Install $label" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} loglevel=4 ide=nodma apm=off noresume edd=off nomodeset 3 + linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3 echo Loading initrd... initrd (\$root)/boot/x86_64/loader/initrd } menuentry "Check Installation Medium" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux (\$root)/boot/x86_64/loader/linux loglevel=4 mediacheck=1 plymouth.enable=0 \${isoboot} + linux (\$root)/boot/x86_64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot} echo Loading initrd... initrd (\$root)/boot/x86_64/loader/initrd } diff --git a/live/root/usr/lib/dracut/modules.d/97agama-logging/agama-logging.sh b/live/root/usr/lib/dracut/modules.d/97agama-logging/agama-logging.sh new file mode 100644 index 0000000000..90caa5408e --- /dev/null +++ b/live/root/usr/lib/dracut/modules.d/97agama-logging/agama-logging.sh @@ -0,0 +1,6 @@ +#! /bin/sh + +# Display only kernel errors and more severe messages on the console. This is +# equivalent of using "loglevel=4" boot option, but we cannot use it because it +# would be written also to the bootloader configuration in the installed system. +dmesg --console-level 4 diff --git a/live/root/usr/lib/dracut/modules.d/97agama-logging/module-setup.sh b/live/root/usr/lib/dracut/modules.d/97agama-logging/module-setup.sh new file mode 100755 index 0000000000..197651defd --- /dev/null +++ b/live/root/usr/lib/dracut/modules.d/97agama-logging/module-setup.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# called by dracut +check() { + return 0 +} + +# called by dracut +depends() { + return 0 +} + +installkernel() { + return 0 +} + +# called by dracut +install() { + inst_hook cmdline 97 "$moddir/agama-logging.sh" +} diff --git a/live/src/config.sh b/live/src/config.sh index 6204477498..25f3d49642 100644 --- a/live/src/config.sh +++ b/live/src/config.sh @@ -90,6 +90,9 @@ echo "root_disk=live:LABEL=$label" >>/etc/cmdline.d/10-liveroot.conf echo 'install_items+=" /etc/cmdline.d/10-liveroot.conf "' >/etc/dracut.conf.d/10-liveroot-file.conf echo 'add_dracutmodules+=" dracut-menu agama-cmdline "' >>/etc/dracut.conf.d/10-liveroot-file.conf +# decrease the kernel logging on the console, use a dracut module to do it early in the boot process +echo 'add_dracutmodules+=" agama-logging "' > /etc/dracut.conf.d/10-agama-logging.conf + # add xhci-pci-renesas to initrd if available (workaround for bsc#1237235) # FIXME: remove when the module is included in the default driver list in # in /usr/lib/dracut/modules.d/90kernel-modules/module-setup.sh, see