Changeset 2592 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin

Timestamp:

Mar 11, 2010, 2:56:03 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3724@localhost: bruno | 2010-03-10 00:46:58 +0100

• Remove more busyboix references
• Avoid some actions when called standalone

Location:

branches/2.2.10/mindi/rootfs/sbin

Files:

• init (modified) (3 diffs)
• install-additional-tools (modified) (1 diff)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -618 +618 @@
     echo "********************************************************************"
     echo "MINDI-LINUX by Mondo Dev Team - web site: http://www.mondorescue.org"
-    echo "Boot disk based on AlfaLinux & Trinux. BusyBox by Erik Andersen."
 which petris > /dev/null 2> /dev/null && echo "Petris was written by Peter Seidler <p.seidler@mail1.stofanet.dk>."
     echo "Executables and source code are covered by the GNU GPL. No warranty."
@@ -792 +791 @@
     ExtractDataDisksAndLoadModules
 else
-    HandleCDROM
+    if [ -f "$MINDI_CACHE/mondorestore.cfg" ] ; then
+        HandleCDROM
+    fi
     ExtractDataDisksAndLoadModules
     # We need to get here exported variables from start-netfs
@@ -827 +828 @@
     [ "$res" != "1" ] && [ "$res" != "" ] && Die "This is CD #$res in the series. Please insert CD #1."
     [ -e "/cdrom.lnk" ] && mv -f /cdrom.lnk /dev/cdrom && mount /dev/cdrom /mnt/cdrom && CD_MOUNTED_OK=yes
-    [ "$CD_MOUNTED_OK" != "yes" ] && TryAgainToFindCD
-    #mount | grep cdrom > /dev/null 2> /dev/null || mount /dev/cdrom /mnt/cdrom >> $LOGFILE 2>> $LOGFILE
+    [ "$CD_MOUNTED_OK" != "yes" ] && [ -f $MINDI_CACHE/mondorestore.cfg ] && TryAgainToFindCD
 fi
 hack-cfg-if-necessary || LogIt "Cannot find hack-cfg-if-necessary"

branches/2.2.10/mindi/rootfs/sbin/install-additional-tools

@@ -49 +49 @@
     cd $mountdir
     counter=0
-    for fname in `tar -zxvf $tarball` ; do
-     counter=$(($counter+1))
-        [ "$(($counter % 4))" -eq "0" ] && echo -en "\r\t\t\t\t\t\t\t\\"
-        [ "$(($counter % 4))" -eq "1" ] && echo -en "\r\t\t\t\t\t\t\t|"
-        [ "$(($counter % 4))" -eq "2" ] && echo -en "\r\t\t\t\t\t\t\t/"
-        [ "$(($counter % 4))" -eq "3" ] && echo -en "\r\t\t\t\t\t\t\t-"
-    done
+    if [ -f $tarball ]; then
+        for fname in `tar -zxvf $tarball` ; do
+            counter=$(($counter+1))
+            [ "$(($counter % 4))" -eq "0" ] && echo -en "\r\t\t\t\t\t\t\t\\"
+            [ "$(($counter % 4))" -eq "1" ] && echo -en "\r\t\t\t\t\t\t\t|"
+            [ "$(($counter % 4))" -eq "2" ] && echo -en "\r\t\t\t\t\t\t\t/"
+            [ "$(($counter % 4))" -eq "3" ] && echo -en "\r\t\t\t\t\t\t\t-"
+        done
+    fi
     cd $old_pwd
     echo -e -n "\r"