Changeset 3203 in MondoRescue

Timestamp:

Dec 6, 2013, 3:40:40 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Test /tmp/mountlist.txt existence before using it in mindi, as mindi can be use in standalone mode without mondoarchive creating that file

Location:

branches/3.2/mindi/rootfs

Files:

• etc/init.d/rcS (modified) (5 diffs)
• sbin/post-init (modified) (1 diff)

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -511 +511 @@
                 for l in $EXCLUDE_LVS; do
                     # FIXME: Should search for all possible device names here
-                    grep -Ev "/dev/$v/$l" /tmp/mountlist.txt > /tmp/mountlist.txt.new
-                    grep -Ev "/dev/mapper/${v}-$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
+                    if [ -f "/tmp/mountlist.txt" ]; then
+                        grep -Ev "/dev/$v/$l" /tmp/mountlist.txt > /tmp/mountlist.txt.new
+                        grep -Ev "/dev/mapper/${v}-$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
+                    fi
                 done
             done
@@ -577 +579 @@
         return;
     fi
-    if [ "`grep mpath /tmp/mountlist.txt`" ]; then
+    if [ -f "/tmp/mountlist.txt" ] && [ "`grep mpath /tmp/mountlist.txt`" ]; then
         if [ -x /sbin/multipath ]; then
             echo "Starting Mpath..."
@@ -602 +604 @@
     fi
 
-    raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
+    if [ -f "/tmp/mountlist.txt" ]; then
+        raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
+    else
+        raid_devices=""
+    fi
+
     if which raidstart > /dev/null 2> /dev/null ; then
         for i in $raid_devices ; do
@@ -879 +886 @@
     for d in $MINDI_EXCLUDE_DEVS ; do
         echo "Mountlist exclusion == $d"
-        perl -i -ne 'print $_ unless m~$d~' /tmp/mountlist.txt
+        if [ -e "/tmp/mountlist.txt" ]; then
+            perl -i -ne 'print $_ unless m~$d~' /tmp/mountlist.txt
+        fi
     done
 else
@@ -965 +974 @@
 sleep 2
 #clear
-if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
+if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ -e "/tmp/mountlist.txt" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
     LogIt "Creating /dev/md/* softlinks just in case." 1
     mkdir -p /dev/md

branches/3.2/mindi/rootfs/sbin/post-init

@@ -8 +8 @@
 sleep 1
 
-echo "Here is my /tmp/mountlist.txt" >> $LOGFILE
-cat /tmp/mountlist.txt >> $LOGFILE
+if [ -f "/tmp/mountlist.txt" ]; then
+    echo "Here is my /tmp/mountlist.txt" >> $LOGFILE
+    cat /tmp/mountlist.txt >> $LOGFILE
+fi
 
 iso=`grep iso /proc/cmdline`