Changeset 2432 in MondoRescue

Timestamp:

Sep 28, 2009, 2:16:31 PM (15 years ago)

Author:

Bruno Cornec

Message:

Warning emited in case of duplicate mountpoints or devices in fstab found

File:

• branches/2.2.9/mindi/mindi (modified) (6 diffs)

branches/2.2.9/mindi/mindi

@@ -1294 +1294 @@
         else
             if [ "$partition_format" = "dos" ] || [ "$partition_format" = "msdos" ] ; then
-                echo "Stupid bastard..." >> $LOGFILE
+                    echo "vfat should be used instead of dos/msdos as a partition format" >> $LOGFILE
                 partition_format="vfat"
             fi
@@ -1303 +1303 @@
 }
 
+CheckMountlist() {
+    local file=$1
+    # Coherency verification
+    ML0=`cat $file | wc -l`
+    ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
+    ML2=`$AWK '{print $2}' $file | sort -u | wc -l`
+    if [ "$ML0" -ne "$ML1" ]; then
+        echo "--------------------------------------------" >> $LOGFILE
+        echo "WARNING: Duplicate device entry in mountlist" | tee -a $LOGFILE
+        echo "--------------------------------------------" >> $LOGFILE
+    fi
+    if [ "$ML0" -ne "$ML2" ]; then
+        echo "--------------------------------------------" >> $LOGFILE
+        echo "WARNING: Duplicate mountpoint entry in mountlist" | tee -a $LOGFILE
+        echo "------------------------------------------------" >> $LOGFILE
+    fi
+}
 
 MakeSureNumberIsInteger() {
@@ -1927 +1944 @@
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
     MakeMountlist $MINDI_TMP/mountlist.txt
+    CheckMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $bigdir/tmp
     cp -f $MINDI_TMP/mountlist.txt $bigdir/tmp/mountlist.txt 2>> $LOGFILE || Die "Cannot copy mountlist.txt from $MINDI_TMP to data disk"
@@ -1943 +1961 @@
     cat $bigdir/tmp/mountlist.txt >> $LOGFILE
     echo "-----------------------------------" >> $LOGFILE
+
     echo -en "$FILES_IN_FILELIST" > $bigdir/FILES-IN-FILELIST 2>> $LOGFILE
     echo -en "$LAST_FILELIST_NUMBER" > $bigdir/LAST-FILELIST-NUMBER 2>> $LOGFILE
@@ -2680 +2699 @@
         [ ! "$2" ] && Die "Please specify the output file"
         MakeMountlist $2
+        CheckMountlist $2
         # Avoids logfile content for mondo
         export MONDO_SHARE=""
@@ -2814 +2834 @@
     MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
     MakeMountlist $MINDI_TMP/mountlist.txt
+    CheckMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $MINDI_TMP/small-all/tmp
     cd $MINDI_TMP/small-all