Changeset 1531 in MondoRescue

Timestamp:

Jul 6, 2007, 4:37:54 PM (18 years ago)

Author:

Bruno Cornec

Message:

Support for swap with UUID on VMWare ESX 3 at least with dumpuuid

File:

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

branches/2.2.4/mindi/mindi

@@ -1333 +1333 @@
             fi
     
-            # 2nd try : blkid, the good way for all LABEL except swap
+            # 2nd try : blkid, the good way for all UUID except swap
             if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
                 actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | cut -d':' -f1`
@@ -1356 +1356 @@
                 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
+
+            # 4th try, with dumpuuid (VMWare only ?) for swap
+            if [ "x$actual_dev" = "x" -a -x "/sbin/dumpuuid" ]; then
+                list_dev=`cat /proc/swaps | /bin/grep -E '^/' | $AWK '{ print $1 }' `
+                for dev in $list_dev ; do
+                    dev_exists=`/sbin/dumpuuid $dev | /bin/grep "$uuid"`
                     if [ "x$dev_exists" != "x" ]; then
                         actual_dev=$dev
@@ -2915 +2927 @@
 lsmod >> $LOGFILE
 MODULES="`cat /proc/modules | awk '{print $1}'`"
-if [ -e /usr/sbin/esxcfg-module ]; then
+if [ -x /usr/sbin/esxcfg-module ]; then
     echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
     echo "-------------" >> $LOGFILE
     echo "VMWare modules" >> $LOGFILE
     echo "-------------" >> $LOGFILE
-    esxcfg-module -l >> $LOGFILE
+    /usr/sbin/esxcfg-module -l >> $LOGFILE
     MODULES="$MODULES `esxcfg-module -l | awk '{print $1}'`"
 fi