Changeset 525 in MondoRescue

Timestamp:

May 5, 2006, 11:52:49 AM (18 years ago)

Author:

bcornec

Message:

merge -r 522:523 $SVN_M/branches/stable (swap label v2)

File:

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

branches/2.0.8/mindi/mindi

@@ -1338 +1338 @@
     [ "$c_p" = "none" ] && continue
     absolute_partition=`ResolveSoftlink $c_p`
-    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
 
     # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
     # current_partition contains only first column of /etc/fstab
-    redhat_label=""
     if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
         str_to_find_fmt_with=$current_partition
@@ -1350 +1349 @@
         # 1st try : blkid, the good way
         if [ -x "/sbin/blkid" ] ; then
-            actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1`
-        fi
+            actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
+        fi
+
         # 2nd try, which works on a standard partition (ext2/3), but not on swap
-        if [ $actual_dev="" ] ; then
+        if [ -n $actual_dev ] ; then
             actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
         fi
+
         # 3rd try, with vol_id (which works with swap)
-        if [ $actual_dev="" -a -x "/sbin/vol_id" ] ; then
+        if [ -n $actual_dev -a -x "/sbin/vol_id" ] ; then
                 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
                 for dev_swap in $list_swaps ; do
-                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f "$redhat_label"`
+                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
                     if [ -n "$dev_exists" ] ; then
                         actual_dev=$dev_swap
@@ -1367 +1368 @@
                 done
         fi
+
         # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
-        if [ $actual_dev="" -a  "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then
-                actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`"
-        fi
+        if [ -n $actual_dev -a  "`echo "$current_partition" | /bin/grep -i "LABEL=SWAP"`" != ""] ; then
+                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
+                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
+                if [ -n "$present_dev" ] ; then
+                    actual_dev="/dev/$try_dev"
+                fi
+        fi
+
         # Check if one of all those tries has known success
-        if [  $actual_dev != "" ] ; then
+        if [ ! -n $actual_dev ] ; then
                 current_partition=$actual_dev
         else
-            Die "Your system uses a labelled swap partition, but you lack the tool to su
-pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
+            Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
         fi
     else