Changeset 1824 in MondoRescue for branches

Timestamp:

Nov 29, 2007, 1:12:14 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Some VMWare support improvements (however, it seems that VMWare support won't be possible anytime soon)
• during init at restore time, copy all static evices availble for udev, as some distro implementation are not yet supported correctly for udev. Not very elegant, but should solve our current issues

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -970 +970 @@
     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
-    [ -e "/vmfs/volumes" ] && echo "/vmfs/volumes"
+    if [ -e "/vmfs/volumes" ]; then
+        # For VMWare ESX 3 get the device names of these volumes
+        vdf -P | grep -E '/vmfs/volumes' | awk '{print $1}'
+    fi
     return
 }

branches/2.2.5/mindi/rootfs/sbin/init

@@ -309 +309 @@
         /sbin/udevsettle
     fi
+    # It seems we need to have more static devs on some distro were
+    # udev as some other requirements to be covered later on.
+    # So in the mean time:
+    for d in `ls /dev.static`; do
+        if [ ! -e /dev/$d ]; then
+            mv /dev.static/$d /dev
+        fi
+    done
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -587 +595 @@
 mkdir /sys 2> /dev/null
 mount /sys/ /sys -v -t sysfs 2>> $LOGFILE
+# For ESX 3
+[ -d /proc/vmware ] && ! grep -q /vmfs /proc/mounts && mount -t vmfs /vmfs /vmfs
 rm -f /foozero
 

branches/2.2.5/mondo/src/mondorestore/mondo-prep.c

@@ -2211 +2211 @@
     } else if (strcmp(format, "minix") == 0) {
         strcpy(partcode, "81");
-    } else if (strcmp(format, "vmfs") == 0) {
+    } else if (strcmp(format, "vmfs3") == 0) {
         strcpy(partcode, "fb");
+    } else if (strcmp(format, "vmkcore") == 0) {
+        strcpy(partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
         strcpy(partcode, "fd");