Changeset 1986 in MondoRescue

Timestamp:

Jun 20, 2008, 3:54:45 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix #262 (based on a patch from arneb)

File:

• branches/2.2.7/mindi/mindi (modified) (4 diffs)

branches/2.2.7/mindi/mindi

@@ -1016 +1016 @@
         fi
 
+        # set default in case we dont't find it
+        str_to_find_fmt_with=$current_partition
+
         # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
         # current_partition contains only first column of /etc/fstab
         if [ "`echo "$current_partition" | /bin/grep -i "LABEL="`" != "" ]; then
-            str_to_find_fmt_with=$current_partition
             redhat_label=`echo "$current_partition" | cut -d'=' -f2`
             actual_dev=""
@@ -1089 +1091 @@
         # current_partition contains only first column of /etc/fstab
         elif [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
-            str_to_find_fmt_with=$current_partition
             uuid=`echo "$current_partition" | cut -d'=' -f2`
             actual_dev=""
@@ -1150 +1151 @@
             # they use symlinks in fstab unrelated to what is shown in mount !
             if [ _"$partition_mountpt" = _"" ]; then
+                # set default in case we dont't find it
                 for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -Ev "^#" | $AWK '{print $1}'`; do
                         if [ _"`readlink -f $tmpp`" = _"$current_partition" ]; then
@@ -1157 +1159 @@
                         fi
                 done
-            else
-                str_to_find_fmt_with=$current_partition
             fi
         fi