Changeset 834 in MondoRescue for branches

Timestamp:

Sep 25, 2006, 6:57:06 PM (19 years ago)

Author:

Bruno Cornec

Message:

All references to busybox in mindi have been cleaned up.

Location:

branches/stable/mindi

Files:

• .config-busybox-i386 (deleted)
• .config-busybox-ia64 (deleted)
• ChangeLog (modified) (1 diff)
• README.busybox (modified) (1 diff)
• install.sh (modified) (2 diffs)
• mindi (modified) (1 diff)
• rootfs/bin/busybox-i386 (deleted)
• rootfs/bin/busybox-i386.net (deleted)
• rootfs/bin/busybox-ia64 (deleted)

branches/stable/mindi/ChangeLog

@@ -2 +2 @@
 
 MINDI CHANGES
+
+1.2.0 (2006-09-25)
+- busybox is now a separate package and binaries are not provided anymore in mindi (Bruno Cornec)
 
 1.0.9 (2006-08-05)

branches/stable/mindi/README.busybox

@@ -1 +1 @@
 Mindi uses the busybox (http://busybox.net) project to create the boot environement used during restore.
 
-If you want to modify the busybox support, you have to:
-
-1/ Get busybox sources and extract them
-2/ Copy as a base the .config file from the mindi directory under the name .config in this source directory.
-   3 files are proposed:
-   .config-busybox-i386.net : Configure busybox for Network support (NFS, PXE)
-   .config-busybox-i386     : Configure busybox for Normal support (CDs, DVD, Tapes)
-   .config-busybox-ia64     : Configure busybox for Normal and Network support on ia64/Itanium
-3/ Reconfigure busybox (make menuconfig)
-4/ Rebuild the new busybox (make busybox)
-5/ copy the new busybox binary from that directory to rootfs/bin under the mindi source tree
-   3 files are proposed:
-   busybox-i386.net : busybox with Network support (NFS, PXE)
-   busybox-i386     : busybox with Normal support (CDs, DVD, Tapes)
-   busybox-ia64     : busybox with Normal and Network support on ia64/Itanium
-6/ Relaunch mindi or mondoarchive if you use it.
+The best manner to use it is to also install our mindi-busybox package/tar file with your mindi installation.
+If you rather want to install your distribution busybox, you'll have to check it supports all the required function our is providing, that it's place under /usr/lib/mindi/rootfs/bin/busybox and that ll required links are created.

branches/stable/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
@@ -65 +64 @@
 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

branches/stable/mindi/mindi

@@ -2869 +2869 @@
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
-        # Here we need the net busybox
-        mv $mountpoint/bin/busybox.net $mountpoint/bin/busybox
-    else
-        rm -f $mountpoint/bin/busybox.net
     fi
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"