Changeset 2576 in MondoRescue

Timestamp:

Feb 5, 2010, 5:51:53 PM (15 years ago)

Author:

Bruno Cornec

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.

Location:

branches/2.2.10

Files:

• mindi/analyze-my-lvm (modified) (3 diffs)
• mindi/mindi (modified) (2 diffs)
• 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`
-        list_of_devices=`$LVMCMD pvs | grep " $current_VG " | awk '{print $1}'`
+        current_PVs=`$LVMCMD pvs | grep " $current_VG " | awk '{print $1}'`
+        list_of_devices=$current_PVs
     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
-    echo "# $LVMCMD vgcreate $current_VG$VG_params $list_of_devices"
+    echo "# $LVMCMD vgcreate $current_VG$VG_params $current_PVs"
     echo "# $LVMCMD vgchange -a y $current_VG"
 }

branches/2.2.10/mindi/mindi

@@ -56 +56 @@
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod edd paride ata_generic ata_piix libata dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks pata_sis amd74xx sis5513 jmicron sata_promise sata_via serverworks"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod edd paride ata_generic ata_piix libata dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks pata_sis amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress"
+USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress 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
-                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
+                if  [ "`echo " $list_of_devices " | grep " $d"`" != "" ]; then
                     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.");
-        mr_asprintf(command, "gzip -dc %s | %s -h --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
+        if (strstr(executable,"acl")) {
+            /*  setfacl needs no additional option for physical walk */
+            mr_asprintf(tmp,"");
+        } else {
+            /*  setfattr needs option -h for physical walk */
+            mr_asprintf(tmp,"-h");
+        }
+        mr_asprintf(command, "gzip -dc %s | %s %s --restore - 2>> %s", original_exat_fname, executable, tmp, MONDO_LOGFILE);
+        mr_free(tmp);
         log_msg(1, "command = %s", command);
         retval = system(command);