From 1e0dcdc7e50bf0fa21dfd022702a21ca6525f584 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 12 Feb 2021 16:17:11 -0800 Subject: [PATCH] Use inst.rescue to trigger rescue mode anaconda in F34 and Rawhide recently stopped accepting params without the inst. prefix, so 'rescue' does nothing except print a warning now. We need to use `inst.rescue`. This has worked for quite a long time so will be OK at least on all Fedoras and RHEL 8, not sure about RHEL 7. Signed-off-by: Adam Williamson Signed-off-by: Brian C. Lane --- 80-rhel/config_files/aarch64/grub2-efi.cfg | 2 +- 80-rhel/config_files/ppc/grub.cfg.in | 2 +- 80-rhel/config_files/sparc/boot.msg | 2 +- 80-rhel/config_files/x86/grub2-efi.cfg | 2 +- 80-rhel/config_files/x86/isolinux.cfg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/80-rhel/config_files/aarch64/grub2-efi.cfg b/80-rhel/config_files/aarch64/grub2-efi.cfg index 1cc389d..1ce5d33 100644 --- a/80-rhel/config_files/aarch64/grub2-efi.cfg +++ b/80-rhel/config_files/aarch64/grub2-efi.cfg @@ -40,7 +40,7 @@ submenu 'Troubleshooting -->' { initrd @INITRDPATH@ } menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { - linux @KERNELPATH@ @ROOT@ rescue + linux @KERNELPATH@ @ROOT@ inst.rescue initrd @INITRDPATH@ } } diff --git a/80-rhel/config_files/ppc/grub.cfg.in b/80-rhel/config_files/ppc/grub.cfg.in index 417856e..aa5f1dc 100644 --- a/80-rhel/config_files/ppc/grub.cfg.in +++ b/80-rhel/config_files/ppc/grub.cfg.in @@ -14,7 +14,7 @@ menuentry "Test this media & install @PRODUCT@ @VERSION@ (64-bit kernel)" --cla } menuentry "Rescue a @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { - linux /ppc/ppc64/vmlinuz @ROOT@ rescue ro + linux /ppc/ppc64/vmlinuz @ROOT@ inst.rescue ro initrd /ppc/ppc64/initrd.img } diff --git a/80-rhel/config_files/sparc/boot.msg b/80-rhel/config_files/sparc/boot.msg index f9cfb8a..ed74246 100644 --- a/80-rhel/config_files/sparc/boot.msg +++ b/80-rhel/config_files/sparc/boot.msg @@ -5,5 +5,5 @@ - To install in text mode, type: linux text . - - To enter rescue mode type: linux rescue . + - To enter rescue mode type: linux inst.rescue . diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg index 951fb54..8c9adad 100644 --- a/80-rhel/config_files/x86/grub2-efi.cfg +++ b/80-rhel/config_files/x86/grub2-efi.cfg @@ -34,7 +34,7 @@ submenu 'Troubleshooting -->' { initrdefi @INITRDPATH@ } menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { - linuxefi @KERNELPATH@ @ROOT@ rescue quiet + linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet initrdefi @INITRDPATH@ } } diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg index 0471f42..1b3fae2 100644 --- a/80-rhel/config_files/x86/isolinux.cfg +++ b/80-rhel/config_files/x86/isolinux.cfg @@ -93,7 +93,7 @@ label rescue and edit config files to try to get it booting again. endtext kernel vmlinuz - append initrd=initrd.img @ROOT@ rescue quiet + append initrd=initrd.img @ROOT@ inst.rescue quiet label memtest menu label Run a ^memory test