Changeset 2995 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

Apr 12, 2012, 3:38:39 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Solve #610 by adding a --nolog option to mindi, which needs to be the first one, and used in analyze-my-lvm with a rdirection of errors to /dev/null.
• Improve udev.conf file for Mageia by adding some required files
• Improve logs generation in mindi by removing remaining oddities

File:

• branches/3.0/mindi/mindi (modified) (18 diffs)

branches/3.0/mindi/mindi

@@ -156 +156 @@
     if [ _"$MONDO_SHARE" != _"" ] ; then
         echo "------------- mindi logfile included -------------------------" >> /var/log/mondoarchive.log
-        cat $LOGFILE >> /var/log/mondoarchive.log
+        if [ -f $LOGFILE ]; then
+            cat $LOGFILE >> /var/log/mondoarchive.log
+        else
+            echo "No LOGFILE available in that mindi run"  >> /var/log/mondoarchive.log
+        fi
         echo "--------------------------------------------------------------">> /var/log/mondoarchive.log
     fi
@@ -230 +234 @@
     [ "$KBDEPTH" -gt "128" ] && Die "Edit $MINDI_SBIN/mindi and disable FindAndAddUserKeyboardMappingFile (line 2160, approx.)"
     if [ -e "$bigdir/$mappath" ] ; then
-        LogFile "$mappath already added" >> $LOGFILE
+        LogFile "INFO: $mappath already added" >> $LOGFILE
         return
     elif [ -d "$bigdir/$mappath" ] ; then
@@ -236 +240 @@
         return
     fi
-    LogFile "Added kbd map $mappath" >> $LOGFILE
+    LogFile "INFO: Added kbd map $mappath" >> $LOGFILE
     if [ ! -e "$mappath" ] ; then
             mappath=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
@@ -503 +507 @@
     fi
     if [ ! -e "$1" ] ; then
-        LogIt "WARNING - cannot search specific path '$1'"
+        LogIt "WARNING: cannot search specific path '$1'"
         return 1
     fi
@@ -885 +889 @@
     for fname in $incoming ; do
         if [ ! -e "$fname" ] ; then
-            LogFile "WARNING - $fname does not exist; cannot be LDD'd."
+            LogFile "WARNING: $fname does not exist; cannot be LDD'd."
             if echo $fname | grep lvm &> /dev/null ; then
                 LogFile "          This warning only affects you if you are using LVM."
@@ -1414 +1418 @@
     # Coherency verification
     ML01=`cat $file | wc -l`
-    ML02=`grep -v ' lvm ' $file | wc -l`
+    ML02=`grep -vE ' lvm | raid | swap ' $file | wc -l`
     ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
-    ML2=`grep -v ' lvm ' $file | $AWK '{print $2}' | sort -u | wc -l`
+    ML2=`grep -v ' lvm | raid | swap ' $file | $AWK '{print $2}' | sort -u | wc -l`
     if [ "$ML01" -ne "$ML1" ]; then
         LogFile "--------------------------------------------"
@@ -2048 +2052 @@
         for i in $EXTRA_MODS ; do
             j=`find lib/modules/$FAILSAFE_KVER -name $i.*o.gz 2> /dev/null`
-            [ ! "$j" ] && LogFile "WARNING - cannot find failsafe module $i.o.gz"
+            [ ! "$j" ] && LogFile "WARNING: cannot find failsafe module $i.o.gz"
             for k in $j ; do
                 tar cf - $k 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogIt "ERROR: module $k extraction issue" $MINDI_TMP/$$.log
@@ -2679 +2683 @@
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         LogFile "INFO: Deleting devfsd daemon from ramdisk"
-        [ ! -e "/sbin/devfsd" ] && LogFile "...because /sbin/devfsd not found"
-        [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && LogFile "...because kernel is failsafe"
+        [ ! -e "/sbin/devfsd" ] && LogFile "      ...because /sbin/devfsd not found"
+        [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] && LogFile "      ...because kernel is failsafe"
         rm -f $mountpoint/sbin/devfsd
     fi
@@ -2722 +2726 @@
         rm -f ${rdz_fname}.tmp
         # log that we are done
-        LogFile "...done."
+        LogFile "      ...done."
     elif [ "$gvFileSystem" = "initramfs" ]; then
         # say what will be used
@@ -2737 +2741 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done
-        LogFile "...done."
+        LogFile "      ...done."
     else
         Die "Filesystem $gvFileSystem not supported for initrd image. Terminating."
@@ -2763 +2767 @@
 fi
 
+# --nolog needs to be first, and is used in analyze-my-lvm
+if [ "$1" = "--nolog" ] ; then
+    shift
+    LOGFILE=/dev/stderr
+else
+    > $LOGFILE
+fi
 if [ "$1" = "--printvar" ] ; then
     shift
@@ -2771 +2782 @@
 fi
 
-> $LOGFILE
 LogFile "mindi v$MINDI_VERSION"
 LogFile "$ARCH architecture detected"
@@ -2795 +2805 @@
     LogFile "-----------------------------"
 fi
-
+LogFile "In Mindi"
+LogFile "--------"
+LogFile "EXTRA_SPACE = $EXTRA_SPACE"
+LogFile "BOOT_SIZE = $BOOT_SIZE"
+LogFile "--------"
 
 trap AbortHere SIGTERM SIGHUP SIGQUIT SIGKILL SIGABRT SIGINT
@@ -2869 +2883 @@
 LogFile "-------------"
 mount >> $LOGFILE
-LogFile "-------------"
 if [ -e /etc/raidtab ]; then
     LogFile "-------------"
@@ -2928 +2941 @@
 df -T >> $LOGFILE
 LogFile "-------------"
-LogFile "Liste of extra modules is:"
+LogFile "List of extra modules is:"
 LogFile "$EXTRA_MODS"
 LogFile "-------------"
@@ -3130 +3143 @@
 
 for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
-    modprobe $i >> $LOGFILE 2>> $LOGFILE
+    modprobe $i 2>&1 > /dev/null
 done
 
@@ -3231 +3244 @@
         OfferToMakeBootableUSB
     fi
-    LogIt "Finished."
 elif [ "$TAPEDEV" ] ; then
     if [ "$ARCH" != "ia64" ] ; then
@@ -3254 +3266 @@
 fi
 # cleanup
-LogIt "$FRIENDLY_OUTSTRING"
+LogIt "INFO: $FRIENDLY_OUTSTRING"
 for mtpt in $FLOPPY_WAS_MOUNTED ; do
     mount $mtpt