- merged patrys changes from 10.2.0.52

Changed files:
    anaconda-mk-images -> 1.6
    anaconda-scrubtree -> 1.3

diff --git a/anaconda-mk-images b/anaconda-mk-images
index fa7ad776bbdfcd05942ec6eb42c802599973c71b..369feb7c08555fbbf36a083733921dd73a201235 100644 (file)
--- a/anaconda-mk-images
+++ b/anaconda-mk-images
@@ -88,6 +88,11 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS
        LIBDIR=lib
     fi
 
+       FONTARCH=${BASEARCH}
+       if [ $FONTARCH = i686 ]; then
+               FONTARCH=i386
+       fi
+
     rm -rf $IMAGEPATH
     rm -rf $FULLMODPATH
     rm -rf $FINALFULLMODPATH
@@ -103,7 +108,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS
     TRIMPCIIDS=$IMGPATH/usr/lib/anaconda-runtime/trimpciids
     GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
     KEYMAPS=/tmp/keymaps-$BUILDARCH.$$
-    SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz
+    SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${FONTARCH}.gz
     GETMODDEPS=$IMGPATH/usr/lib/anaconda-runtime/moddeps
     MODLIST=$IMGPATH/usr/lib/anaconda-runtime/modlist
     MODINFO=$IMGPATH/usr/lib/anaconda-runtime/loader/module-info
@@ -443,7 +448,7 @@ EOF
     cp -f $IMGPATH/bin/busybox $MBD_DIR/sbin/busybox
     
     # make some symlinks
-    ln -sf bash $MBD_DIR/sbin/sh
+    ln -sf bash $MBD_DIR/bin/sh
     (cd $MBD_DIR/sbin;
        set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
        while [ -n "$1" ]; do
@@ -758,6 +763,8 @@ doPostImages() {
 if [ ${BUILDARCH} = s390x ]; then
     # FIXME: this is a bad hack for s390, but better than copying for now
     source $TOPDIR/mk-images.s390
+elif [ ${BUILDARCH} = i686 ]; then
+       source $TOPDIR/mk-images.i386
 else
     source $TOPDIR/mk-images.${BUILDARCH}
 fi
@@ -766,8 +773,8 @@ fi
 kerneltags="kernel"
 if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
     arches="ppc64pseries ppc64 ppc64iseries ppc"
-elif [ "$BUILDARCH" = "i386" ]; then
-    arches="i586"
+elif [ "$BUILDARCH" = "i686" ]; then
+    arches="i386 i586 i686"
     kerneltags="kernel kernel-xenU"
 elif [ "$BUILDARCH" = "x86_64" ]; then
     arches="x86_64"

diff --git a/anaconda-scrubtree b/anaconda-scrubtree
index 16fcd16035a3bf543af628d3abba4afd3c00f6e4..e21fa94c5a40fd8943d44b0547d9c3a79c6cb0a3 100644 (file)
--- a/anaconda-scrubtree
+++ b/anaconda-scrubtree
@@ -46,7 +46,7 @@ rm $p/etc/ld.so.conf
 #
 # HOWEVER dont clobber existing programs supplied by other packages if exist
 #
-mv $p/usr/sbin/busybox.anaconda $p/usr/bin/busybox
+mv $p/sbin/busybox.anaconda $p/usr/bin/busybox
 (cd $p/usr/bin;
 set $(./busybox 2>&1| awk '/^\t([[:alnum:]_\[]+,)+/' | sed 's/,//g' | sed 's/ +//');
 dontclobber=(sh busybox reboot shutdown poweroff)