Changeset 903 in MondoRescue for trunk/mindi/rootfs/sbin

Timestamp:

Oct 25, 2006, 1:49:52 AM (19 years ago)

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

Location:

trunk/mindi/rootfs/sbin

Files:

• MyInsmod (modified) (1 diff)
• init (modified) (3 diffs)
• install-additional-tools (modified) (5 diffs)
• untar-and-softlink (modified) (2 diffs)
• wait-for-petris (modified) (2 diffs)

trunk/mindi/rootfs/sbin/MyInsmod

@@ -4 +4 @@
 for i in insmod.static insmod busybox ; do
     if [ "$i" = "busybox" ] ; then
-        $i insmod $*
+        $i insmod $* 2> /dev/null
     else
-        $i $*
+        $i $* 2> /dev/null
     fi
     res=$?

trunk/mindi/rootfs/sbin/init

@@ -328 +328 @@
     fi
 
-}
-
-
-SwapTheMountExecs() {
-    if [ -e "/bin/mount.libc5" ] ; then
-        LogIt "Swapping busybox's mount with libc5 mount"
-        mv /bin/mount /bin/mount.bb
-        mv /bin/mount.libc5 /bin/mount
-        sync
-    fi
 }
 
@@ -468 +458 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i pxe /proc/cmdline`" ]; then
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 
     # Simulate a local CD
@@ -477 +468 @@
     HandleCDROMorFloppies
     ExtractDataDisksAndLoadModules
-    /sbin/start-nfs
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
 fi
 res=$?
-SwapTheMountExecs
 ConfigureLoggingDaemons
 if [ -e "/tmp/USE-DEVFS" ] ; then

trunk/mindi/rootfs/sbin/install-additional-tools

@@ -1 +1 @@
 #!/bin/sh
 #
-# 05/04/2003
-# - added missing 'res=0' to line 34
-# - replaced /mnt/groovy-stuff with $GROOVY
+# $Id$
 #
-# 07/17/2002
-# - delete dest files before moving src files there
-#
-# 07/11/2002
-# - move softlinks from /mnt/groovy-stuff to / afterward
-#
-# 03/21/2002
-# - added "PLEASE WAIT" when untarring/softlinking
-#
-# 02/18/2002
 ########################################################################
 
@@ -38 +26 @@
 else
     while [ "$diskno" -lt "20" ] ; do
-    LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
-    untar-and-softlink $diskno $mountdir /
-    res=$(($res+$?))
-    [ -e "/LAST-DISK" ] && diskno=999
-    diskno=$(($diskno+1))
-    [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
+        LogIt "PLEASE WAIT. Untarring and softlinking disk #$diskno" 2
+        untar-and-softlink $diskno $mountdir /
+        res=$(($res+$?))
+        [ -e "/LAST-DISK" ] && diskno=999
+        diskno=$(($diskno+1))
+        [ -e "/tmp/CDROM-LIVES-HERE" ] && [ ! -f "/mnt/cdrom/images/$diskno.tar.gz" ] && break
     done
 fi
@@ -59 +47 @@
     sliceno=0
     while [ "$sliceno" -le "999" ] ; do
-    slicefile=$stub.
+        slicefile=$stub.
         [ "$sliceno" -lt "100" ] && slicefile="$slicefile"0
-    [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
-    slicefile="$slicefile"$sliceno
-    [ ! -e "$slicefile" ] && break
+        [ "$sliceno" -lt "10" ]  && slicefile="$slicefile"0
+        slicefile="$slicefile"$sliceno
+        [ ! -e "$slicefile" ] && break
 #   echo "biggienumber=$biggienumber slicefile=$slicefile" >> /tmp/mondo-restore.log
-    cat $slicefile >> /tmp/out.dat
-    rm -f $slicefile
-    sliceno=$(($sliceno+1))
-    done
+        cat $slicefile >> /tmp/out.dat
+        rm -f $slicefile
+        sliceno=$(($sliceno+1))
+        done
 #    echo "$sliceno slices"
 
@@ -94 +82 @@
 for path in `find | grep -v /etc/fstab` ; do
     if [ -d "$path" ] ; then
-    mkdir /$path 2> /dev/null
+        mkdir /$path 2> /dev/null
     else
 # Patch from Andrew Bulhak
@@ -102 +90 @@
         fi
 # end patch
-    mv -f $path /$path
+        mv -f $path /$path
     fi
 done
 cp -f etc/fstab /tmp/fstab
+tar cf - sbin bin usr/bin usr/sbin lib usr/lib lib64 usr/lib64 | (cd / ; tar xf -)
+
 cd /
-
-
-# Was disabled in mid-March 2002 (?). Dunno why. Re-enabled July 11th, 2002.
-# BERLIOS: This doesn't work for symlink with new busybox in PXE mode
-#for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
-    #[ ! -e "$path" ] && mkdir -p "$path"
-    #for i in `ls $mountdir/$path 2> /dev/null` ; do
-    #rm -f $path/$i 2> /dev/null
-        #mv $mountdir/$path/$i $path 2> /dev/null
-    #done   
-#done
-
-cd $mountdir 
-tar cf - sbin bin usr/bin usr/sbin lib usr/lib | (cd / ; tar xf -)
-cd /
-
 
 for i in modprobe lsmod depmod rmmod ; do

trunk/mindi/rootfs/sbin/untar-and-softlink

@@ -1 +1 @@
 #!/bin/sh
+#
+# $Id$
+#
+########################################################################
+
 
 Die() {
@@ -20 +25 @@
 else
     while [ ! -f "$tarball" ] ; do
-    echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
-    read line
-    mount /dev/fd0 -t ext2 -o ro $mountpoint
-    [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
-    echo -en "Working..."
+        echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
+        read line
+        mount /dev/fd0 -t ext2 -o ro $mountpoint
+        [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
+        echo -en "Working..."
     done
 fi

trunk/mindi/rootfs/sbin/wait-for-petris

@@ -6 +6 @@
 # Say what we are doing
 echo -n "Waiting for petris"
-# Get the right linker for architecture
-arch=`uname -m`
-case $arch in
-  'ia64')
-    linker="/lib/ld-linux-ia64.so.2" ;;
-  'x86_64')
-    linker="/lib/ld-linux-x86-64.so.2" ;;
-  *)
-    # we only run on the above two and IA32, so this must be it
-    linker="/lib/ld-linux.so.2" ;;
-esac
-# First wait for the libraries to become available...
-while   [ ! -f /lib/libncurses.so.5 -o ! -f /lib/libc.so.6 -o ! -f "$linker" ] ; do
+# Wait for the libraries to become available...
+while   [ ! -f /lib/libncurses.so.5 ] ; do
   echo -n "."
-  sleep 1
+  sleep 2
 done
+sleep 2
 # ...then wait for petris
 which petris > /dev/null
@@ -30 +20 @@
 done
 # Keep running petris until it's killed or crashes
-while [ $? -eq 0 ] ; do
+while [ 0 -eq 0 ] ; do
     clear
     sleep 1