Changeset 957 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Nov 21, 2006, 11:07:15 AM (17 years ago)

Author:

Bruno Cornec

Message:

Preliminary UUID support (for Ubuntu and VMWare)
(they are not yet restored, just handled in mindi)

File:

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

branches/stable/mindi/mindi

@@ -924 +924 @@
     local res currline partition all_partitions ap_orig remaining i j
 
-    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||LABEL\=\// && !/fdd|cdr|zip|floppy/ {print $1}'
+    grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL\=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
     return
@@ -1211 +1211 @@
         [ "$c_p" = "none" ] && continue
         redhat_label=""
+        uuid=""
         absolute_partition=`readlink -f $c_p`
         partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
@@ -1284 +1285 @@
             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
+            str_to_find_fmt_with=$current_partition
+            uuid=`echo "$current_partition" | /bin/cut -d'=' -f2`
+            actual_dev=""
+
+            # 1st try, findfs - the RHEL way of finding labels and their partitions
+            if [ -x "/sbin/findfs" ]; then
+                actual_dev=`/sbin/findfs UUID=${uuid} 2> /dev/null`
+            fi
+    
+            # 2nd try : blkid, the good way for all LABEL except swap
+            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
+                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | /bin/cut -d':' -f1`
+                # For LVM FS it will give a /dev/dm-# which should then be converted
+                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
+                    major=`/bin/ls -l $actual_dev | awk '{print $5}'`
+                    minor=`/bin/ls -l $actual_dev | awk '{print $6}'`
+                    for dev in `ls /dev/mapper/*`; do
+                        major1=`/bin/ls -l $dev | awk '{print $5}'`
+                        minor1=`/bin/ls -l $dev | awk '{print $6}'`
+                        if [ $major1 = $major ] && [ $minor1 = $minor ]; then
+                            actual_dev=`/bin/ls -l $dev | awk '{print $10}'`
+                            break
+                        fi
+                    done
+                fi
+            fi
+    
+            # 3th try, with vol_id 
+            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
+                list_dev=`mount | /bin/grep -E '^/' | /bin/awk '{ print $1 }' `
+                for dev in $list_dev ; do
+                    dev_exists=`/sbin/vol_id $dev | /bin/grep "$uuid"`
+                    if [ "x$dev_exists" != "x" ]; then
+                        actual_dev=$dev
+                        break;
+                    fi
+                done
+            fi
+
             # Check if one of all those tries has known success
             if [ "x$actual_dev" != "x" ]; then
                 current_partition=$actual_dev
             else
-                Die "Your system uses a labelled 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\n"
+                Die "Your system uses a UUID 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\n"
             fi
         else