Changeset 1497 in MondoRescue for branches/2.2.4

Timestamp:

Jun 9, 2007, 1:33:26 AM (17 years ago)

Author:

Bruno Cornec

Message:

Improve ESX+vmfs support - needs testing

Location:

branches/2.2.4

Files:

• mindi/deplist.txt (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/my-stuff.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (2 diffs)

branches/2.2.4/mindi/deplist.txt

@@ -22 +22 @@
 mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.jfs mkfs.xfs mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm
 fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks
+vmkfstools
 
 #-------------------------------- ESSENTIAL -----------------------------------

branches/2.2.4/mindi/mindi

@@ -2903 +2903 @@
 lsmod >> $LOGFILE
 MODULES="`cat /proc/modules | awk '{print $1}'`"
+if [ -e /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
+    MODULES="$MODULES `esxcfg-module -l | awk '{print $1}'`"
+fi
 echo "-------------" >> $LOGFILE
 echo "Liste of extra modules is:" >> $LOGFILE

branches/2.2.4/mondo/src/common/my-stuff.h

@@ -474 +474 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm cifs"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs vmfs dos minix coda nfs ntfs hpfs raid lvm cifs"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"

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

@@ -2212 +2212 @@
     } else if (strcmp(format, "minix") == 0) {
         strcpy(partcode, "81");
+    } else if (strcmp(format, "vmfs") == 0) {
+        strcpy(partcode, "fb");
     } else if (strcmp(format, "raid") == 0) {
         strcpy(partcode, "fd");
@@ -2532 +2534 @@
     } else if (strcmp(format, "minix") == 0) {
         strcpy(program, "mkfs.minix");
+    } else if (strcmp(format, "vmfs") == 0) {
+        strcpy(program, "mkfs -t vmfs");
 #endif
     } else if (strcmp(format, "ext2") == 0) {