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

Timestamp:

Mar 22, 2010, 1:56:46 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3763@localhost: bruno | 2010-03-18 12:03:49 +0100

• Fix CMDLINE variable initialization to do it after /proc is mounted
• Fix backup-media-type handling in mondorestore (wrong test)

File:

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

branches/2.2.10/mindi/rootfs/sbin/init

@@ -7 +7 @@
 
 export MINDI_CACHE=CCC
-
-if [ -e "/proc/cmdline" ]; then
-    export CMDLINE="/proc/cmdline"
-elif [ -e "/tmp/cmdline" ]; then
-    export CMDLINE="/tmp/cmdline"
-else
-    export CMDLINE="/dev/null"
-fi
-
 
 
@@ -721 +712 @@
 #/bin/update
 mount /proc/ /proc -v -t proc 
+
+# Now we can look at command line
+if [ -e "/proc/cmdline" ]; then
+    # Linux
+    export CMDLINE="/proc/cmdline"
+elif [ -e "/tmp/cmdline" ]; then
+    # BSD ?
+    export CMDLINE="/tmp/cmdline"
+else
+    export CMDLINE="/dev/null"
+fi
+
 mkdir /sys 2> /dev/null
 mount /sys/ /sys -v -t sysfs 2>> $LOGFILE
@@ -891 +894 @@
 
 fi
-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"
-    # start-netfs moved it under /tmp as the NFS share is already unmounted 
-    if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
-        pre=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
-    fi
-    if [ -x $pre ]; then
-        echo "Executing preliminary script $pre"
-        LogIt "Executing preliminary script $pre"
-        $pre
-    fi
-    post-init
+if [ -f $MINDI_CACHE/mondorestore.cfg ]; then 
+    grep -q "backup-media-type" $MINDI_CACHE/mondorestore.cfg
+    if [ $? -eq 0 ]; then
+        LogIt "backup-media-type is specified in config file - great."
+        LogIt "Calling post-init"
+        # start-netfs moved it under /tmp as the NFS share is already unmounted 
+        if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
+            pre=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
+        fi
+        if [ -x $pre ]; then
+            echo "Executing preliminary script $pre"
+            LogIt "Executing preliminary script $pre"
+            $pre
+        fi
+        post-init
+    else
+        LogIt "backup-media-type is not specified in config file."
+        LogIt "I think this media has no archives on it."
+    fi
 else
-    LogIt "backup-media-type is not specified in config file."
+    LogIt "$MINDI_CACHE/mondorestore.cfg not found."
     LogIt "I think this media has no archives on it."
 fi