FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian KDE

 
 
LinkBack Thread Tools
 
Old 01-12-2012, 12:54 PM
Martin Sivak
 
Default Workaround a bash bug to install some packages also on ix86.

Bash didn't treated strings in =~ as regexps.
For further info see release notes in bug #558537.

Resolves: rhbz#750126
---
scripts/upd-instroot | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 186ec46..5c78c36 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -206,7 +206,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda
xorg-x11-server-Xorg xorg-x11-xkb-utils xorg-x11-xfs yum
yum-metadata-parser zenity zlib /etc/gtk-2.0/gtkrc"

-if [[ $ARCH =~ "i[356]86" ]]; then
+if [[ $ARCH =~ i[356]86 ]]; then
PACKAGES="$PACKAGES glibc.$ARCH openssl.$ARCH"
elif [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
PACKAGES="$PACKAGES glibc.sparcv9 openssl.sparcv9"
@@ -214,11 +214,11 @@ else
PACKAGES="$PACKAGES glibc openssl"
fi

-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" ]]; then
PACKAGES="$PACKAGES pcmciautils grub"
fi

-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" || $ARCH == "ia64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" || $ARCH == "ia64" ]]; then
PACKAGES="$PACKAGES dmidecode efibootmgr"
fi

@@ -254,7 +254,7 @@ PACKAGESRESCUE="bzip2 bzip2-libs dump
firstaidkit-plugin-mdadm-conf firstaidkit-plugin-key-recovery
volume_key"

-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" ]]; then
PACKAGESRESCUE="$PACKAGESRESCUE gpart grub firstaidkit-plugin-grub"
fi

@@ -265,7 +265,7 @@ if [ $ARCH = sparc -o $ARCH = sparcv9 -o $ARCH = sparc64 ]; then
PACKAGES="$PACKAGES tilo silo"
fi

-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" ]]; then
PACKAGES="$PACKAGES syslinux memtest86+ grub"
fi

@@ -948,7 +948,7 @@ for cmd in `rpm -ql lvm2 | grep /sbin/`; do
echo "usr"$cmd;
done >> $KEEPFILERESCUE

-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" ]]; then
cat >> $KEEPFILERESCUE <<-EOF
sbin/grub
usr/bin/gpart
@@ -1209,7 +1209,7 @@ if [ $ARCH = ia64 ]; then
fi

# copy bootloader files for i386/x86_64
-if [[ $ARCH =~ "i[356]86" || $ARCH == "x86_64" ]]; then
+if [[ $ARCH =~ i[356]86 || $ARCH == "x86_64" ]]; then
mkdir -p $DEST/usr/lib/anaconda-runtime/boot
cp -af $DEST/boot/memtest* $DEST/usr/lib/anaconda-runtime/boot
fi
--
1.7.4.4

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

Thread Tools




All times are GMT. The time now is 07:11 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org