Changeset 3279 in MondoRescue for branches/3.2/mindi/rootfs

Timestamp:

Apr 30, 2014, 1:05:17 PM (10 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/mindi/rootfs

Files:

• etc/init.d/rcS (modified) (1 diff)
• usr/sbin/post-init (modified) (2 diffs)
• usr/sbin/start-netfs (modified) (1 diff)

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