From 771b7237abc3b3ac49e6e90782e05f42b01d9d8d Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 25 Oct 2021 14:18:43 -0700 Subject: [PATCH] Drop ppc 32 bit support from grub template for live iso It wasn't working right, and we don't support 32 bit anyway, so update to match non-live grub template with 64 bit only. Resolves: rhbz#2017175 --- 80-rhel/live/config_files/ppc/grub.cfg.in | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/80-rhel/live/config_files/ppc/grub.cfg.in b/80-rhel/live/config_files/ppc/grub.cfg.in index 630b376..99703ad 100644 --- a/80-rhel/live/config_files/ppc/grub.cfg.in +++ b/80-rhel/live/config_files/ppc/grub.cfg.in @@ -3,19 +3,15 @@ set timeout=5 echo -e "\nWelcome to the @PRODUCT@ @VERSION@ installer!\n\n" -for BITS in 32 64; do - if [ -d "/ppc/ppc${BITS}" ]; then - menuentry "Start @PRODUCT@ @VERSION@ (${BITS}-bit kernel)" $BITS --class fedora --class gnu-linux --class gnu --class os { - linux /ppc/ppc${2}/vmlinuz @ROOT@ @EXTRA@ ro rd.live.image quiet - initrd /ppc/ppc${2}/initrd.img - } +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 + initrd /ppc/ppc64/initrd.img +} - menuentry "Test this media & start @PRODUCT@ @VERSION@ (${BITS}-bit kernel)" $BITS --class fedora --class gnu-linux --class gnu --class os { - linux /ppc/ppc${2}/vmlinuz @ROOT@ @EXTRA@ rd.live.image rd.live.check ro quiet - initrd /ppc/ppc${2}/initrd.img - } - fi -done +menuentry "Test this media & start @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os { + linux /ppc/ppc64/vmlinuz @ROOT@ @EXTRA@ rd.live.image rd.live.check ro quiet + initrd /ppc/ppc64/initrd.img +} submenu 'Other options...' { menuentry 'Reboot' { @@ -26,4 +22,3 @@ submenu 'Other options...' { exit } } -