Changeset 2947 in MondoRescue

Timestamp:

Feb 15, 2012, 1:42:18 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #586: mindi now skips swap files in the mountlist creation

File:

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

branches/3.0/mindi/mindi

@@ -1314 +1314 @@
             partition_size="lvm"
         else
-            partition_size=`SizeOfPartition $current_partition`
             [ "`echo "$current_partition" | grep "[0-9]"`" = "" ] && continue
             [ "`echo "$current_partition" | grep -c "^/"`" -ne "1" ] && continue
             if [ "$partition_format" = "swap" ] || [ "$partition_mountpt" = "swap" ] ; then
+                # Skip swap files
+                [ "`echo "$current_partition" | grep -E "^/dev"`" = "" ] && continue
                 partition_size=`grep -Fv "Priority" /proc/swaps | tr -s '\t' ' ' | grep -F "$current_partition " | $AWK '{print $3}'`
                 [ "$partition_mountpt" != "swap" ] && partition_mountpt="swap"
@@ -1332 +1333 @@
                     echo "I'm guessing $c_p is $(($partition_size/1024))MB" >> $LOGFILE
                 fi
+            else
+                partition_size=`SizeOfPartition $current_partition`
             fi
         fi