Changeset 2576


Ignore:
Timestamp:
Feb 5, 2010, 5:51:53 PM (9 years 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.
Location:
branches/2.2.10
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/analyze-my-lvm

    r2569 r2576  
    134134    if [ $lvmversion = 2 ]; then
    135135        VG_params=`GenerateVgcreateParameters $current_VG`
    136         list_of_devices=`$LVMCMD pvs | grep " $current_VG " | awk '{print $1}'`
     136        current_PVs=`$LVMCMD pvs | grep " $current_VG " | awk '{print $1}'`
     137        list_of_devices=$current_PVs
    137138    else
    138139        info_file=/proc/lvm/VGs/$current_VG/group
     
    145146            list_of_devices="$list_of_devices $device"
    146147        done
     148        current_PVs=$list_of_devices
    147149    fi
    148150    l=""
     
    164166        done
    165167    fi
    166     echo "# $LVMCMD vgcreate $current_VG$VG_params $list_of_devices"
     168    echo "# $LVMCMD vgcreate $current_VG$VG_params $current_PVs"
    167169    echo "# $LVMCMD vgchange -a y $current_VG"
    168170}
  • branches/2.2.10/mindi/mindi

    r2569 r2576  
    5656
    5757# ide-probe-mod
    58 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"
     58IDE_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"
    5959PCMCIA_MODS="pcmcia_core ds yenta_socket"
    60 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"
     60USB_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"
    6161NET_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"
    6262CDROM_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"
     
    11571157        skip=0
    11581158        if [ "$MINDI_EXCLUDE_DEVS" ] ; then
     1159            l=""
     1160            list_of_devices="`ReadAllLink $current_partition`"
     1161            for d in $list_of_devices; do
     1162                l="$l `GiveMapperOfdm $d`"
     1163            done
     1164            list_of_devices="`echo $l | sort -u`"
    11591165            for d in $MINDI_EXCLUDE_DEVS ; do
    1160                 if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
     1166                if  [ "`echo " $list_of_devices " | grep " $d"`" != "" ]; then
    11611167                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
    11621168                    skip=1
  • branches/2.2.10/mondo/src/common/libmondo-filelist.c

    r2569 r2576  
    525525    int i;
    526526    char *p, *q;
     527    char *tmp = NULL;
    527528    FILE *pin, *pout, *faclin;
    528529
     
    531532        || !does_file_exist(orig_msklist)) {
    532533        log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
    533         mr_asprintf(command, "gzip -dc %s | %s -h --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
     534        if (strstr(executable,"acl")) {
     535            /*  setfacl needs no additional option for physical walk */
     536            mr_asprintf(tmp,"");
     537        } else {
     538            /*  setfattr needs option -h for physical walk */
     539            mr_asprintf(tmp,"-h");
     540        }
     541        mr_asprintf(command, "gzip -dc %s | %s %s --restore - 2>> %s", original_exat_fname, executable, tmp, MONDO_LOGFILE);
     542        mr_free(tmp);
    534543        log_msg(1, "command = %s", command);
    535544        retval = system(command);
Note: See TracChangeset for help on using the changeset viewer.