Changeset 3702 in MondoRescue for branches

Timestamp:

Apr 11, 2018, 2:05:18 AM (6 years ago)

Author:

Bruno Cornec

Message:

• Fix #838 by skipping subvol fstab lines for the mountlist

File:

• branches/3.3/mindi/mindi (modified) (5 diffs)

branches/3.3/mindi/mindi

@@ -829 +829 @@
 
 ListAllPartitions() {
-    grep -Evx " *#.*| *none.*" $MY_FSTAB | $AWK '/^\/dev\/[imhs]d||^LABEL=\/|^UUID=/ && !/\/fdd|\/cdr|\/zip|\/floppy/ {print $1}'
+    grep -Evx " *#.*| *none.*" $MY_FSTAB | $AWK '/^\/dev\/[imhs]d||^LABEL=\/|^UUID=/ && !/\/fdd|\/cdr|\/zip|\/floppy/ {print $1}' | sort -u
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
     if [ -e "/vmfs/volumes" ]; then
@@ -1073 +1073 @@
     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"
     for c_p in $all_partitions ; do
-        # Skip fd/cd devices, network FS, cifs
+        # Skip fd/cd devices, network FS, cifs, brtfs subvols
         [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -E "^//"`" != "" ]&& continue
         [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
@@ -1089 +1089 @@
         fi
         [ "$c_p" = "none" ] && continue
+
         redhat_label=""
         label=""
@@ -1253 +1254 @@
         fi
 
+        # Avoid analyzing btrfs subvol partitions
+        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$str_to_find_fmt_with" | grep -vx " *#.*" | $AWK '{print $4}' | grep -v 'subvol=' | head -n1`
         # Detects noauto partitions not mounted and exclude them
-        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$str_to_find_fmt_with" | 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)"
+            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)"
+            LogFile "INFO: Excluding $current_partition from mountlist (due to bind option in fstab)"
             continue
         fi
@@ -1292 +1294 @@
         fi
 
-        partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
+        # sort in case of btrfs subvol
+        partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB | sort -u`
         # Detects iso9660 ISO images and exclude them
         if [ "`echo "$partition_format" | grep -iw iso9660`" != "" ]; then