[lorax-rhel7/master] Drop 32 bit for loop from ppc64 grub2 config (#1169878)

Brian C. Lane bcl at redhat.com
Tue Dec 2 17:42:03 UTC 2014


Older versions of petitboot don't understand the for loop and won't
boot.  We also don't shipt 32 bit media anymore so there is no reason
for this to remain.
---
 share/config_files/ppc/grub.cfg.in | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/share/config_files/ppc/grub.cfg.in b/share/config_files/ppc/grub.cfg.in
index b156ede..417856e 100644
--- a/share/config_files/ppc/grub.cfg.in
+++ b/share/config_files/ppc/grub.cfg.in
@@ -3,24 +3,20 @@ 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 "Install @PRODUCT@ @VERSION@ (${BITS}-bit kernel)"  $BITS --class fedora --class gnu-linux --class gnu --class os {
-      linux /ppc/ppc${2}/vmlinuz @ROOT@ ro
-      initrd /ppc/ppc${2}/initrd.img
-    }
+menuentry "Install @PRODUCT@ @VERSION@ (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ ro
+      initrd /ppc/ppc64/initrd.img
+}
 
-    menuentry "Test this media & install @PRODUCT@ @VERSION@  (${BITS}-bit kernel)" $BITS --class fedora --class gnu-linux --class  gnu --class os {
-      linux /ppc/ppc${2}/vmlinuz @ROOT@ rd.live.check ro
-      initrd /ppc/ppc${2}/initrd.img
-      }
+menuentry "Test this media & install @PRODUCT@ @VERSION@  (64-bit kernel)" --class fedora --class gnu-linux --class  gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ rd.live.check ro
+      initrd /ppc/ppc64/initrd.img
+}
 
-    menuentry "Rescue a @PRODUCT@ system (${BITS}-bit kernel)" $BITS  --class fedora --class gnu-linux --class gnu --class os {
-      linux /ppc/ppc${2}/vmlinuz @ROOT@ rescue ro
-      initrd /ppc/ppc${2}/initrd.img
-      }
-  fi
-done
+menuentry "Rescue a @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
+      linux /ppc/ppc64/vmlinuz @ROOT@ rescue ro
+      initrd /ppc/ppc64/initrd.img
+}
 
 submenu 'Other options...' {
   menuentry 'Reboot' {
-- 
1.9.3



More information about the anaconda-patches mailing list