Changeset 3026 in MondoRescue for branches/3.0/mindi

Timestamp:

Jul 3, 2012, 8:00:08 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4936@localhost: bruno | 2012-07-03 18:26:03 +0200

• Fix #621 by avoiding to handle iso9660 FS type from fstab as well as bind mounted FS.

File:

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

branches/3.0/mindi/mindi

@@ -1070 +1070 @@
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
     printf "        %-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
-    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs"
+    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1 tmpfs devpts sysfs proc debugfs iso9660"
     for c_p in $all_partitions ; do
         # Skip fd/cd devices, network FS, cifs
@@ -1092 +1092 @@
         partition_option=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $4}' | head -n1`
         if [ "`echo "$partition_option" | grep -i noauto`" != "" ] && [ "`mount | grep -w "$partition_mountpt"`" =  "" ] ; then
+                LogFile "INFO: Excluding $current_partition from mountlist (due to noauto option in fstab)"
+            continue
+        fi
+        # Detects bind partitions and exclude them
+        if [ "`echo "$partition_option" | grep -iw bind`" != "" ]; then
+                LogFile "INFO: Excluding $current_partition from mountlist (due to bind option in fstab)"
             continue
         fi