Changeset 2591 in MondoRescue for branches/2.2.10/mindi/rootfs/sbin/init

Timestamp:

Mar 11, 2010, 2:56:00 AM (14 years ago)

Author:

Bruno Cornec

Message:

r3723@localhost: bruno | 2010-03-09 23:56:51 +0100

• No error msg if mondorestore.cfg doesn't exist (mindi alone)

File:

• branches/2.2.10/mindi/rootfs/sbin/init (modified) (6 diffs)

branches/2.2.10/mindi/rootfs/sbin/init

@@ -123 +123 @@
     cd $GROOVY
     [ "$1" != "" ] && tapedev=$1
-    [ ! "$tapedev" ] && tapedev=`grep media-dev $MINDI_CACHE/mondorestore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
+    [ ! "$tapedev" ] && [ -f $MINDI_CACHE/mondorestore.cfg ] && tapedev=`grep media-dev $MINDI_CACHE/mondorestore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
     mt -f $tapedev rewind
     mt -f $tapedev fsf 2
@@ -563 +563 @@
     local res
     mount | grep /mnt/cdrom && return 0
-    [ "`grep "backup_media_type" $MINDI_CACHE/mondorestore.cfg 2> /dev/null | grep "cdstream"`" ] && return
+    [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep "backup_media_type" $MINDI_CACHE/mondorestore.cfg 2> /dev/null | grep "cdstream"`" ] && return
     LogIt "Trying to mount CD-ROM a 2nd time..."
     find-and-mount-cdrom --second-try
@@ -719 +719 @@
     export DENY_MODS=" "
 fi
-if [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ]; then
+if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2> /dev/null`" ]; then
     # Do not try to load usb storage when dealing with OBDR it makes the modprobe hang :-(
     export DENY_MODS="usb-storage $DENY_MODS"
@@ -774 +774 @@
 fi
 
-if [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then
+if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ "`grep -i 'obdr ' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' $MINDI_CACHE/mondorestore.cfg 2>/dev/null`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -783 +783 @@
     ExtractDataDisksAndLoadModules
     # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
-    sed -i "s/backup-media-type.*/backup-media-type netfs/" $MINDI_CACHE/mondorestore.cfg
+    [ -f $MINDI_CACHE/mondorestore.cfg ] && sed -i "s/backup-media-type.*/backup-media-type netfs/" $MINDI_CACHE/mondorestore.cfg
 elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb $MINDI_CACHE/mondorestore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
@@ -878 +878 @@
     fi
 fi
-if grep "backup-media-type" $MINDI_CACHE/mondorestore.cfg > /dev/null 2> /dev/null ; then
+if [ -f $MINDI_CACHE/mondorestore.cfg ] && [ grep "backup-media-type" $MINDI_CACHE/mondorestore.cfg > /dev/null 2> /dev/null ]; then
     LogIt "backup-media-type is specified in config file - great."
     LogIt "Calling post-init"