Changeset 839 in MondoRescue for trunk/mindi/install.sh

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

File:

• trunk/mindi/install.sh (modified) (2 diffs)

trunk/mindi/install.sh

@@ -36 +36 @@
 ARCH=`/bin/arch`
 echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386 && locallib=$local/lib
-# For the moment, we don't build specific x86_64 busybox binaries
-echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386 && locallib=$local/lib64
+echo $ARCH | grep -x "x86_64" &> /dev/null && locallib=$local/lib64
 echo $ARCH | grep -x "ia64" &> /dev/null && locallib=$local/lib
 export ARCH
@@ -68 +67 @@
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
 
-# Managing busybox
-if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH ]; then
-        echo "Installing busybox ..."
-        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH $locallib/mindi/rootfs/bin/busybox
-else
+if [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
-if [ "$ARCH" = "i386" ] ; then
-    if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
-        echo "Installing busybox.net ..."
-        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH.net $locallib/mindi/rootfs/bin/busybox.net
-    else
-        echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
-    fi
-fi
-# Remove left busybox
-rm -f $locallib/mindi/rootfs/bin/busybox-*
 
 # Managing parted2fdisk