Changeset 2576

Timestamp:

02/05/10 17:51:53 (6 months ago)

Author:

bruno

Message:

svn merge -r 2567:2574 /mondorescue/branches/2.2.9
(At parity with 2.2.9.2)

- Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Should really provvide the best support possible for LVM exclusion.
- Also use the same exclusion technique for MINDI_EXCLUDE_DEVS in mindi itself just in case.
- ums-cypress also added to module list following user feedback
- Fix a bug in the vgcreate command generation where too many PVs were mentioned, due to the extension of the list. We now use a $current_PVs variable which is limited to what i needed
- setfacl doesn't need the -h option to restore physical paths
- THis version of mondo uses another interface for the mr_asprintf function than the one used just previously which was coredumping
- Adds support for sata_svw for Proliant DL 385 G5p. Fixes #391.

Files:

• branches/2.2.10/mindi/analyze-my-lvm (modified) (3 diffs)
• branches/2.2.10/mindi/mindi (modified) (2 diffs)
• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

branches/2.2.10/mindi/analyze-my-lvm

@@ -134 +134 @@
-    if [ $lvmversion = 2 ]; then
-        VG_params=`GenerateVgcreateParameters $current_VG`
-
+
+
-    else
-        info_file=/proc/lvm/VGs/$current_VG/group
@@ -145 +146 @@
-            list_of_devices="$list_of_devices $device"
-        done
+        current_PVs=$list_of_devices
-    fi
-    l=""
@@ -164 +166 @@
-        done
-    fi
-list_of_device
+current_PV
-    echo "# $LVMCMD vgchange -a y $current_VG"
-}

branches/2.2.10/mindi/mindi

@@ -56 +56 @@
-
-# ide-probe-mod
-
+ sata_svw
-PCMCIA_MODS="pcmcia_core ds yenta_socket"
-
+ ums-cypress
-NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse libcrc32c crc32c"
-CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
@@ -1157 +1157 @@
-        skip=0
-        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
+            l=""
+            list_of_devices="`ReadAllLink $current_partition`"
+            for d in $list_of_devices; do
+                l="$l `GiveMapperOfdm $d`"
+            done
+            list_of_devices="`echo $l | sort -u`"
-            for d in $MINDI_EXCLUDE_DEVS ; do
-current_partition
+list_of_devices
-                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
-                    skip=1

branches/2.2.10/mondo/src/common/libmondo-filelist.c

@@ -525 +525 @@
-    int i;
-    char *p, *q;
+    char *tmp = NULL;
-    FILE *pin, *pout, *faclin;
-
@@ -531 +532 @@
-        || !does_file_exist(orig_msklist)) {
-        log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
-
+
+
+
+
+
+
+
+
+
-        log_msg(1, "command = %s", command);
-        retval = system(command);