Changeset 3084 in MondoRescue

Timestamp:

Mar 2, 2013, 5:38:31 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Should fix an issue with RHEL 6 where mindi was comparing an info obtained by readlink -f (/dev/dm-1) different from the one in fstab (/dev/mapper/systemvg-root_lv) and the one given by vgs in GiveMapperofDm (/dev/systemvg/root_lv) leding to the FS being skpieed. Now we compare on both sides with readlink -f so we should find whatever is mentioned in fstab and use it. Accordingly the mountopt is now computed after this in order to still skip potential noaucto/bind FS now correctly detected instead of doing it too early.

File:

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

branches/3.0/mindi/mindi

@@ -1105 +1105 @@
         partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
 
-        # Detects noauto partitions not mounted and exclude them
-        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
-
         # set default in case we dont't find it
         str_to_find_fmt_with=$current_partition
@@ -1266 +1254 @@
                 # set default in case we dont't find it
                 for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | grep -Ev "^#" | $AWK '{print $1}'`; do
-                        if [ _"`readlink -f $tmpp`" = _"$current_partition" ]; then
+                        if [ _"`readlink -f $tmpp`" = _"`readlink -f $current_partition`" ]; then
                             str_to_find_fmt_with=$tmpp
                             partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$tmpp" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
@@ -1273 +1261 @@
                 done
             fi
+        fi
+
+        # 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)"
+            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