Changeset 2587


Ignore:
Timestamp:
Mar 3, 2010, 8:24:24 PM (9 years ago)
Author:
bruno
Message:

r3714@localhost: bruno | 2010-03-03 10:42:28 +0100
svk merge -r3649:3678 prj/local-mondorescue/branches/2.2.9


r3666@localhost (orig r2578): bruno | 2010-02-12 13:35:29 +0100

  • Free the sz_devfile fifo for ntfs later as it was used in between, causing a problem to backup NT

FS dev. Fix #392.


r3667@localhost (orig r2579): bruno | 2010-02-12 15:27:07 +0100
analyze-my-lvm now provides an option to call GiveMapperOfdm? that can be used in mindi. Solve #395


r3668@localhost (orig r2580): bruno | 2010-02-12 17:12:18 +0100

  • When using excludevs= also exclude from mountlist the devices mentioned. Fix #393.


r3669@localhost (orig r2581): bruno | 2010-02-12 17:15:53 +0100

  • the post install ascript passed with post= should just exists and not be executable. It's now mad

e executable by init. Maybe a fix for #394


r3670@localhost (orig r2582): vicgat | 2010-02-15 19:35:39 +0100


r3671@localhost (orig r2583): bruno | 2010-02-15 20:05:45 +0100

  • Fix reporting when a module is not found (pollutes logs)


r3672@localhost (orig r2584): bruno | 2010-02-15 20:09:23 +0100

  • Adds a missing module for iSCSI support


r3673@localhost (orig r2585): bruno | 2010-02-15 20:45:50 +0100

  • Fix problems of wrongly detected Duplicate mountpoints in case of lvm


r3674@localhost (orig r2586): bruno | 2010-02-16 13:15:38 +0100

  • Avoids error messages from stat in analyze-my-lvm


r3663@athonet (orig r2577): bruno | 2010-02-09 02:08:39 +0100

  • First try to improve OVM support with ocfs2 and Xen modules added


Location:
branches/2.2.10
Files:
5 edited

Legend:

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

    r2576 r2587  
    239239GiveMapperOfdm () {
    240240
    241 major=`stat -c "%t" $1`
    242 minor=`stat -c "%T" $1`
     241major=`stat -c "%t" $1 2> /dev/null`
     242minor=`stat -c "%T" $1 2> /dev/null`
    243243
    244244for i in `ls /dev/mapper/*`; do
     
    325325
    326326# -------------------------------- main -----------------------------------
     327
     328if [ "$1" = "--givemapperofdm" ] ; then
     329    shift
     330    if [ _"$1" != _"" ] ; then
     331        GiveMapperOfdm $1
     332    fi
     333    exit 0
     334fi
     335
     336
    327337which lvmdiskscan 2>/dev/null 2>&1 || Die "lvmdiskscan not found. Won't handle LVM."
    328338if [ -e "/proc/lvm/global" ] && [ "`tr -s '\t' ' ' < /proc/lvm/global | grep "0 VGs 0 PVs 0 LVs"`" != "" ]; then
  • branches/2.2.10/mindi/deplist.d/base.conf

    r2508 r2587  
    2626/sbin/parted
    2727/usr/sbin/partprobe
     28/sbin/partprobe
    2829
    2930# File
  • branches/2.2.10/mindi/mindi

    r2576 r2587  
    5353MY_FSTAB=/etc/fstab
    5454TAPE_MODS="ht st osst ide-tape ide_tape"
    55 SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib scsi_dump_register"
     55SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi iscsi_tcp libiscsi scsi_transport_iscsi libiscsi_tcp isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib scsi_dump_register"
    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 sata_svw"
     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 blkbk"
    5959PCMCIA_MODS="pcmcia_core ds yenta_socket"
    6060USB_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"
    61 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"
     61NET_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 netbk xenblktap"
    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"
    6363# Those modules will only go on the backup media, not the boot media.
    64 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16"
     64EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
    6565# Replace with that line for HP OCMP e.g.
    6666#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
     
    713713
    714714ListKernelModulePaths() {
    715     local module_list module fname oss r kern
     715    local module_list module fname r kern
    716716    outfile=$1
    717717    echo -en "Analyzing modules requirements"
    718     oss="/root/oss/modules"
    719718    module_list="$MODULES"
    720719    # Remove unwanted modules from list
     
    751750                r="[extra module file not found]"
    752751            fi
     752        else
     753            [ -f "$r" ] && echo "$r"
    753754        fi
    754755        LogFile "module $module --> $r"
    755756        [ -f "$r" ] && echo "$r" >> $outfile
    756         [ -f "$oss" ] && find $oss | grep -F $module >> $outfile
    757757        progress=$(($progress+1))
    758758        LogProgress $progress $noof_lines
    759759    done
    760760    find /lib/modules/$kern/modules.* -type f 2> /dev/null >> $outfile
    761     [ -f "$oss" ] && find $oss.* 2> /dev/null >> $outfile
    762761}
    763762
     
    11601159            list_of_devices="`ReadAllLink $current_partition`"
    11611160            for d in $list_of_devices; do
    1162                 l="$l `GiveMapperOfdm $d`"
     1161                l="$l `$MINDI_LIB/analyze-my-lvm --givemapperofdm $d`"
    11631162            done
    11641163            list_of_devices="`echo $l | sort -u`"
     
    13121311    # Coherency verification
    13131312    ML01=`cat $file | wc -l`
    1314     ML02=`cat $file | grep -v ' lvm ' | wc -l`
     1313    ML02=`grep -v ' lvm ' $file | wc -l`
    13151314    ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
    1316     ML2=`$AWK '{print $2}' $file | grep -v ' lvm ' | sort -u | wc -l`
     1315    ML2=`grep -v ' lvm ' $file | $AWK '{print $2}' | sort -u | wc -l`
    13171316    if [ "$ML01" -ne "$ML1" ]; then
    13181317        LogFile "--------------------------------------------"
  • branches/2.2.10/mindi/rootfs/sbin/init

    r2569 r2587  
    395395        rm -f /tmp/restorevgs
    396396        for d in $MINDI_EXCLUDE_DEVS ; do
    397             echo " == $d"
     397            echo "LVM exclusion == $d"
    398398            EXCLUDE_VGS=`grep " $d" /tmp/i-want-my-lvm | grep vgcreate | awk '{print $4}'`
    399399            vg=`echo $EXCLUDE_VGS | sed "s/ /|/g"`
     
    413413                for l in $EXCLUDE_LVS; do
    414414                    # FIXME: Should search for all possible device names here
    415                     grep -Ev "/dev/$v/$l" /tmp/mountlist.txt > /tmp/mountlist.txt.new
    416                     grep -Ev "/dev/mapper/${v}-$l" /tmp/mountlist.txt.new > /tmp/mountlist.txt
     415                    grep -Ev "/dev/$v/$l" $MINDI_CACHE/mountlist.txt > $MINDI_CACHE/mountlist.txt.new
     416                    grep -Ev "/dev/mapper/${v}-$l" $MINDI_CACHE/mountlist.txt.new > $MINDI_CACHE/mountlist.txt
    417417                done
    418418            done
     
    730730if [ "`grep -i excludedevs /proc/cmdline`" ]; then
    731731    export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"
     732    for d in $MINDI_EXCLUDE_DEVS ; do
     733        echo "Mountlist exclusion == $d"
     734        perl -i -ne 'print $_ unless m~$d~' $MINDI_CACHE/mountlist.txt
     735    done
    732736else
    733737    export MINDI_EXCLUDE_DEVS=" "
     
    804808WelcomeMessage
    805809RstHW
     810[ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
    806811StartRaids
    807812StartMpath
     
    817822    cp -af /dev/md2 /dev/md/2 2> /dev/null
    818823fi
    819 [ -e "$MINDI_CACHE/mountlist.txt" ] && cp -f $MINDI_CACHE/mountlist.txt $MINDI_CACHE/mountlist.original
    820824
    821825if ! [ "`grep -i "pxe" $CMDLINE`" ] ; then
     
    899903        post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`
    900904    fi
    901     if [ -x $post ]; then
     905    if [ -r $post ]; then
    902906        echo "Executing final script $post"
    903907        LogIt "Executing final script $post"
     
    905909            mount-me
    906910        fi
     911        chmod 755 $post
    907912        $post
    908913        if [ "`echo $post | grep -E '^/mnt/RESTORING'`" ]; then
  • branches/2.2.10/mondo/src/common/libmondo-archive.c

    r2508 r2587  
    19641964                default:
    19651965                    log_msg(2, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
    1966                     mr_free(sz_devfile);
    19671966                }
    19681967            }
     
    19771976            }
    19781977            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
     1978
     1979            /* Free it here as ntfsprog_fifo is not used anymore */
     1980            mr_free(sz_devfile);
     1981
    19791982            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    19801983                tmp = calc_checksum_of_file(bigfile_fname);
Note: See TracChangeset for help on using the changeset viewer.