Changeset 3279 in MondoRescue

Timestamp:

Apr 30, 2014, 1:05:17 PM (11 years ago)

Author:

Bruno Cornec

Message:

• flaws_str should be NULL if no error detected not ""
• Try to redirect back fd at restore time before launching mondorestore to avoid garbage in log

Location:

branches/3.2

Files:

• mindi/rootfs/etc/init.d/rcS (modified) (1 diff)
• mindi/rootfs/usr/sbin/post-init (modified) (2 diffs)
• mindi/rootfs/usr/sbin/start-netfs (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (3 diffs)

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

@@ -877 +877 @@
 # Creates log file
 LogIt ""
+# Backup fd
+exec 4>&2 5>&1
 # Redirect every message to the LOGFILE
 exec > >(tee -a ${LOGFILE})

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

@@ -4 +4 @@
 #
 #------------------------------------------------------------
-
-
-sleep 1
 
 if [ -f "/tmp/mountlist.txt" ]; then
@@ -70 +67 @@
 fi
 
+# Now suppress msg redirection to avoid poluting log file
+exec 2>&4 >&5 4>&- 5>&-
+
 if [ "$compare" ] ; then
     LogIt "------------------COMPARE MODE-----------------" 1

branches/3.2/mindi/rootfs/usr/sbin/start-netfs

@@ -117 +117 @@
     elif [ "$proto" = "smbfs" ]; then
         LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
-        mount -t cifs $netfsopt $netfsmount /tmp/isodir -o ro 
+        mount -t cifs $netfsmount /tmp/isodir -o ro $netfsopt 
     elif [ "$proto" != "" ]; then
         if [ -x /sbin/rpcbind ]; then

branches/3.2/mondo/src/common/libmondo-mountlist.c

@@ -556 +556 @@
     drivelist = malloc(sizeof(struct list_of_disks));
     assert(mountlist != NULL);
-    mr_asprintf(flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -573 +572 @@
         if (tmp != NULL) {
             log_msg(8,"Adding: %s to flaws_str", tmp);
-            mr_strcat(flaws_str, "%s", tmp);
+            if (flaws_str != NULL) {
+                mr_strcat(flaws_str, "%s", tmp);
+            } else {
+                mr_asprintf(flaws_str, "%s", tmp);
+            }
             mr_free(tmp);
         }
@@ -591 +594 @@
         if (copies > 1 && last_copy == currline && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
-            mr_strcat(flaws_str, "%s", tmp);
             log_msg(8,"Adding: %s to flaws_str", tmp);
+            if (flaws_str != NULL) {
+                mr_strcat(flaws_str, "%s", tmp);
+            } else {
+                mr_asprintf(flaws_str, "%s", tmp);
+            }
             mr_free(tmp);
         }
         mr_free(curr_mountpoint);
     }
-
     return(flaws_str);
 }