From 823e54dabf2d17f66372bae7978eeb7aea558485 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 26 Mar 2021 08:52:29 -0700 Subject: [PATCH] livemedia-creator: Add rhgb to live iso cmdline (#1943312) These were apparently lost in the transition to livemedia-creator. livecd-creator added them in it's code, and lmc based its live config files on the the boot.iso configs which do not include it (on purpose). --- .../99-generic/live/config_files/aarch64/grub2-efi.cfg | 4 ++-- .../templates.d/99-generic/live/config_files/ppc/grub.cfg.in | 2 +- share/templates.d/99-generic/live/config_files/x86/grub.conf | 2 +- .../99-generic/live/config_files/x86/grub2-efi.cfg | 4 ++-- .../templates.d/99-generic/live/config_files/x86/isolinux.cfg | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg index d0799243..c874547f 100644 --- a/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg +++ b/share/templates.d/99-generic/live/config_files/aarch64/grub2-efi.cfg @@ -27,7 +27,7 @@ search --no-floppy --set=root -l '@ISOLABEL@' ### BEGIN /etc/grub.d/10_linux ### menuentry 'Start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb initrd @INITRDPATH@ } menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { @@ -36,7 +36,7 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class red --class gnu- } submenu 'Troubleshooting -->' { menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb initrd @INITRDPATH@ } } diff --git a/share/templates.d/99-generic/live/config_files/ppc/grub.cfg.in b/share/templates.d/99-generic/live/config_files/ppc/grub.cfg.in index 99703ad5..27b88379 100644 --- a/share/templates.d/99-generic/live/config_files/ppc/grub.cfg.in +++ b/share/templates.d/99-generic/live/config_files/ppc/grub.cfg.in @@ -4,7 +4,7 @@ set timeout=5 echo -e "\nWelcome to the @PRODUCT@ @VERSION@ installer!\n\n" menuentry "Start @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { - linux /ppc/ppc64/vmlinuz @ROOT@ @EXTRA@ ro rd.live.image quiet + linux /ppc/ppc64/vmlinuz @ROOT@ @EXTRA@ ro rd.live.image quiet rhgb initrd /ppc/ppc64/initrd.img } diff --git a/share/templates.d/99-generic/live/config_files/x86/grub.conf b/share/templates.d/99-generic/live/config_files/x86/grub.conf index 6c4a51f3..bb51ca27 100644 --- a/share/templates.d/99-generic/live/config_files/x86/grub.conf +++ b/share/templates.d/99-generic/live/config_files/x86/grub.conf @@ -5,7 +5,7 @@ timeout 60 hiddenmenu title Start @PRODUCT@ @VERSION@ findiso - kernel @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet + kernel @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb initrd @INITRDPATH@ title Test this media & start @PRODUCT@ @VERSION@ findiso diff --git a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg index 2e24b15f..39069585 100644 --- a/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg +++ b/share/templates.d/99-generic/live/config_files/x86/grub2-efi.cfg @@ -21,7 +21,7 @@ search --no-floppy --set=root -l '@ISOLABEL@' ### BEGIN /etc/grub.d/10_linux ### menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet + linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb initrdefi @INITRDPATH@ } menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { @@ -30,7 +30,7 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class g } submenu 'Troubleshooting -->' { menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet + linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb initrdefi @INITRDPATH@ } } diff --git a/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg b/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg index a73f7e05..045cc6e4 100644 --- a/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg +++ b/share/templates.d/99-generic/live/config_files/x86/isolinux.cfg @@ -61,7 +61,7 @@ menu separator # insert an empty line label linux menu label ^Start @PRODUCT@ @VERSION@ kernel vmlinuz - append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image quiet + append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image quiet rhgb label check menu label Test this ^media & start @PRODUCT@ @VERSION@ @@ -83,7 +83,7 @@ label basic @PRODUCT@ @VERSION@. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image nomodeset quiet + append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb label memtest menu label Run a ^memory test