Changeset 1009 in MondoRescue

Timestamp:

Dec 21, 2006, 5:30:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• UUID and LABELS are now both correctly handled by mindi (it's one or the other so only a single else case)
• LABEL SWAP are working again.

File:

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

branches/stable/mindi/mindi

@@ -1282 +1282 @@
                     do
                         # Location of the swap label for kernel 2.6
-                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev &> /dev/null`
+                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
                         if [ "x$try_dev_label" = "x$redhat_label" ]; then
                             actual_dev=$try_dev
@@ -1295 +1295 @@
                 Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
             fi
-        else
-            str_to_find_fmt_with=$current_partition
-        fi
-
         # This part tries to retrieve the correct device from a UUID line in /etc/fstab
         # current_partition contains only first column of /etc/fstab
-        if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
+        elif [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
             str_to_find_fmt_with=$current_partition
             uuid=`echo "$current_partition" | cut -d'=' -f2`