[PATCH 1/2] account for arch==i686

[Dennis Gregorovic <dgregor@xxxxxxxxxx>]

The attached patch updates the logic in upd-instroot to handle the case
where ARCH is set to i686.

-- Dennis

--- anaconda-12.32/scripts/upd-instroot	2009-10-01 14:13:32.923739000 -0400
+++ anaconda-12.32-dg/scripts/upd-instroot	2009-10-01 14:19:59.590084000 -0400
@@ -201,17 +201,19 @@
     PACKAGES="$PACKAGES glibc.i386 openssl.i386"
 elif [ $ARCH = i586 ]; then
     PACKAGES="$PACKAGES glibc.i586 openssl.i586"
+elif [ $ARCH = i686 ]; then
+    PACKAGES="$PACKAGES glibc.i686 openssl.i686"
 elif [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
     PACKAGES="$PACKAGES glibc.sparcv9 openssl.sparcv9"
 else
     PACKAGES="$PACKAGES glibc openssl"
 fi
 
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES pcmciautils grub"
 fi
 
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then
     PACKAGES="$PACKAGES dmidecode efibootmgr"
 fi
 
@@ -245,7 +247,7 @@
 		firstaidkit firstaidkit-plugin-passwd firstaidkit-plugin-xserver
 		firstaidkit-gui firstaidkit-plugin-mdadm-conf firstaidkit-plugin-key-recovery volume_key"
 
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 ]; then
   PACKAGESRESCUE="$PACKAGESRESCUE gpart grub firstaidkit-plugin-grub"
 fi
 
@@ -256,7 +258,7 @@
     PACKAGES="$PACKAGES tilo silo"
 fi
 
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES syslinux memtest86+ grub"
 fi
 
@@ -850,7 +852,7 @@
 usr/bin/firstaidkit-qs
 EOF
 
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 ]; then
     cat >> $KEEPFILERESCUE <<-EOF
 sbin/grub
 usr/bin/gpart
@@ -1052,7 +1054,7 @@
 fi
 
 # copy bootloader files for i386/x86_64
-if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
+if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = i686 -o $ARCH = x86_64 ]; then
     mkdir -p $DEST/usr/lib/anaconda-runtime/boot
     cp -af $DEST/boot/memtest* $DEST/usr/lib/anaconda-runtime/boot
 fi

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list