- remove special casing of s390 in most device-mapper codepaths

1 files changed, 16 insertions, 33 deletions

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index b8eec49e7..1eb7239b2 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -122,7 +122,8 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
 	 python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
 	 db4 rhpxl xorg-x11-server-Xorg libuser system-config-date
          yum-metadata-parser gfs2-utils libvolume_id
-         libdhcp libnl libdhcp6client libdhcp4client"
+	 libdhcp libnl libdhcp6client libdhcp4client
+	 dmraid python-pyblock mkinitrd libbdevid libbdevid-python"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES pcmciautils dmidecode"
@@ -140,10 +141,6 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
               XFree86-libs strace xorg-x11-xauth xorg-x11-libs"
 fi
 
-if [ $ARCH != s390 -a $ARCH != s390x ]; then
-    PACKAGES="$PACKAGES dmraid python-pyblock mkinitrd libbdevid libbdevid-python"
-fi
-
 if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
     PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
 fi
@@ -189,7 +186,8 @@ PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts
            fonts-japanese fonts-chinese fonts-korean fonts-indic 
            fonts-malayalam fonts-oriya fonts-kannada
            fonts-gujarati fonts-hindi fonts-punjabi fonts-tamil synaptics
-           firstboot pycairo pirut dejavu-lgc-fonts"
+           firstboot pycairo pirut dejavu-lgc-fonts
+           dmraid python-pyblock libbdevid libbdevid-python"
 
 #
 # stuff ONLY included for rescue mode
@@ -199,7 +197,8 @@ PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts
 PACKAGESRESCUE="bzip2 bzip2-libs dump
                 findutils ftp gzip iputils joe krb5-libs less man
                 modutils mtools mt-st mtr net-tools open smartmontools
-                openssh openssh-clients pciutils rsh traceroute tar rsync"
+                openssh openssh-clients pciutils rsh traceroute tar rsync
+                device-mapper dmraid"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGESRESCUE="$PACKAGESRESCUE gpart grub"
@@ -211,11 +210,6 @@ if [ -z "$NEEDGR" ]; then
     PACKAGESRESCUE="bash"
 fi
 
-# dmraid stuff
-if [ $ARCH != s390 -a $ARCH != s390x ]; then
-    PACKAGESRESCUE="$PACKAGESRESCUE device-mapper dmraid"
-fi
-
 #
 # add bootloader for particular arch
 #
@@ -242,11 +236,6 @@ fi
 # dogtail stuff...
 PACKAGESGR="$PACKAGESGR gail at-spi libbonobo ORBit2"
 
-# dmraid stuff
-if [ $ARCH != s390 -a $ARCH != s390x ]; then
-    PACKAGESGR="$PACKAGESGR dmraid python-pyblock libbdevid libbdevid-python"
-fi
-
 # modular xorg...
 XORGLIBS="libICE libSM libX11 libXcursor libXext libXfixes libXft libXi libxkbfile libXmu libXpm libXrandr libXrender libXt libXxf86misc libXaw liblbxutil libXfont libfontenc libXau libXdmcp libXfont libXinerama"
 XORGDRIVERS="xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-drv-ark xorg-x11-drv-ati xorg-x11-drv-calcomp xorg-x11-drv-chips xorg-x11-drv-cirrus xorg-x11-drv-citron xorg-x11-drv-cyrix xorg-x11-drv-digitaledge xorg-x11-drv-dmc xorg-x11-drv-dummy xorg-x11-drv-dynapro xorg-x11-drv-elo2300 xorg-x11-drv-elographics xorg-x11-drv-evdev xorg-x11-drv-fbdev xorg-x11-drv-fpit xorg-x11-drv-glint xorg-x11-drv-hyperpen xorg-x11-drv-i128 xorg-x11-drv-i740 xorg-x11-drv-i810 xorg-x11-drv-jamstudio xorg-x11-drv-joystick xorg-x11-drv-keyboard xorg-x11-drv-magellan xorg-x11-drv-magictouch xorg-x11-drv-mga xorg-x11-drv-microtouch xorg-x11-drv-mouse xorg-x11-drv-mutouch xorg-x11-drv-neomagic xorg-x11-drv-nsc xorg-x11-drv-nv xorg-x11-drv-palmax xorg-x11-drv-penmount xorg-x11-drv-rendition xorg-x11-drv-s3 xorg-x11-drv-s3virge xorg-x11-drv-savage xorg-x11-drv-siliconmotion xorg-x11-drv-sis xorg-x11-drv-sisusb xorg-x11-drv-spaceorb xorg-x11-drv-summa xorg-x11-drv-tdfx xorg-x11-drv-tek4957 xorg-x11-drv-trident xorg-x11-drv-tseng xorg-x11-drv-v4l xorg-x11-drv-vesa xorg-x11-drv-vga xorg-x11-drv-via xorg-x11-drv-vmware xorg-x11-drv-void xorg-x11-drv-voodoo"
@@ -847,6 +836,8 @@ bin/zcat
 etc/joe/*
 sbin/arp
 sbin/depmod
+sbin/dmraid.static
+sbin/dmsetup.static
 sbin/dump
 sbin/ifconfig
 sbin/insmod
@@ -911,14 +902,6 @@ usr/sbin/smartctl
 usr/sbin/traceroute
 EOF
 
-# dmraid stuff
-if [ $ARCH != s390 -a $ARCH != s390x ]; then
-    cat >> $KEEPFILERESCUE <<-EOF        
-sbin/dmraid.static
-sbin/dmsetup.static
-EOF
-fi
-
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     cat >> $KEEPFILERESCUE <<-EOF
 boot/grub
@@ -978,16 +961,16 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
 	mv $i/bin/sed $i/bin/sed_save
 	mv $i/bin/sort $i/bin/sort_save
     done
-else
-    for i in $DEST $DESTGR; do
-	# there's never a case with only one of these...
-	if [ -f $i/sbin/dmraid.static ]; then
-	    mv $i/sbin/dmraid.static $i/sbin/dmraid
-	    mv $i/sbin/dmsetup.static $i/sbin/dmsetup
-	fi
-    done
 fi
 
+for i in $DEST $DESTGR; do
+    # there's never a case with only one of these...
+    if [ -f $i/sbin/dmraid.static ]; then
+        mv $i/sbin/dmraid.static $i/sbin/dmraid
+        mv $i/sbin/dmsetup.static $i/sbin/dmsetup
+    fi
+done
+
 # change mtimes to 0 (to match what happens on the cramfs)
 for p in $DEST $DESTGR; do
     $p/usr/lib/anaconda-runtime/fixmtime.py $DEBUG $p