Changeset 2607 in MondoRescue

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)

Location:

branches/2.2.10

Files:

• mindi/rootfs/sbin/init (modified) (3 diffs)
• mondo/src/common/libmondo-fork.c (modified) (3 diffs)
• mondo/src/common/libmondo-tools.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -66 +66 @@
             log_msg(9, "Loop result: ***%s***", tmp);
             */
-            /*  There is empty contant at the end of the file that needs to be skiped */
+            /*  There is empty content at the end of the file that needs to be skiped */
             if (strlen(tmp) > 0) {
                 mr_free(result);
@@ -73 +73 @@
             mr_free(tmp);
         }
-        log_msg(4, "Result: %s", result);
+        log_msg(9, "Pre-Result: %s", result);
         mr_strip_spaces(result);
         paranoid_pclose(fin);
@@ -80 +80 @@
     }
     mr_free(tmpf);
+    log_msg(4, "Result: %s", result);
     return(result);
 }
-
-
-
-
-
 
 #define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -1035 +1035 @@
  * @param label What to read from the file.
  * @param value Where to put it.
- * @return 0 for success, 1 for failure.
+ * @return value of the param or NULL if not found
  */
 char *read_cfg_var(char *config_file, char *label)
@@ -1050 +1050 @@
         log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
         return (NULL);
-        /* BERLIOS: not sure the usage of this one ?
-    } else if ((value != NULL) && (strstr(value, "/dev/") && strstr(value, "t0") && !strcmp(label, "media-dev"))) {
-        log_msg(2, "FYI, I can't read new value for %s - already got %s", label, value);
-        return (0);
-        */
     } else {
         mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
@@ -1060 +1055 @@
         mr_free(command);
 
+        log_msg(4, "Configuration item %s is %s", label, value);
         if (strlen(value) == 0) {
             return (NULL);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -709 +709 @@
 media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
 
-if ((value = read_cfg_var(cfg_file, "backup-media-type")) == 0) {
+if ((value = read_cfg_var(cfg_file, "backup-media-type")) != NULL) {
     if (!strcmp(value, "cdstream")) {
         bkpinfo->backup_media_type = cdstream;