[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Teach upd-instroot about i686



Ack for f13-branch.

On Mon, 2010-05-03 at 20:28 -0700, Jesse Keating wrote:
> Fedora is now i686 based, and as such upd-instroot needs to know what
> packages to pull in.  Resolves RHBZ 588357
> ---
>  scripts/upd-instroot |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/scripts/upd-instroot b/scripts/upd-instroot
> index 169a9ba..f1dbc9f 100755
> --- a/scripts/upd-instroot
> +++ b/scripts/upd-instroot
> @@ -216,11 +216,11 @@ 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
>  
> @@ -256,7 +256,7 @@ PACKAGESRESCUE="bzip2 bzip2-libs dump
>                  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
>  
> @@ -267,7 +267,7 @@ if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
>      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
>  
> @@ -893,7 +893,7 @@ usr/bin/whiptail
>  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
> @@ -1114,7 +1114,7 @@ if [ $ARCH = ia64 ]; then
>  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/share/anaconda/boot
>      cp -af $DEST/boot/memtest* $DEST/usr/share/anaconda/boot
>  fi



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]