Changeset 2587 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Mar 3, 2010, 8:24:24 PM (14 years ago)

Author:

Bruno Cornec

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

File:

• branches/2.2.10/mindi/mindi (modified) (5 diffs)

branches/2.2.10/mindi/mindi

@@ -53 +53 @@
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
-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"
+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 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"
 
 # 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 sata_svw"
+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 blkbk"
 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 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"
+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 netbk xenblktap"
 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"
 # Those modules will only go on the backup media, not the boot media.
-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"
+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 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -713 +713 @@
 
 ListKernelModulePaths() {
-    local module_list module fname oss r kern
+    local module_list module fname r kern
     outfile=$1
     echo -en "Analyzing modules requirements"
-    oss="/root/oss/modules"
     module_list="$MODULES"
     # Remove unwanted modules from list
@@ -751 +750 @@
                 r="[extra module file not found]"
             fi
+        else
+            [ -f "$r" ] && echo "$r"
         fi
         LogFile "module $module --> $r" 
         [ -f "$r" ] && echo "$r" >> $outfile
-        [ -f "$oss" ] && find $oss | grep -F $module >> $outfile
         progress=$(($progress+1))
         LogProgress $progress $noof_lines
     done
     find /lib/modules/$kern/modules.* -type f 2> /dev/null >> $outfile
-    [ -f "$oss" ] && find $oss.* 2> /dev/null >> $outfile
 }
 
@@ -1160 +1159 @@
             list_of_devices="`ReadAllLink $current_partition`"
             for d in $list_of_devices; do
-                l="$l `GiveMapperOfdm $d`"
+                l="$l `$MINDI_LIB/analyze-my-lvm --givemapperofdm $d`"
             done
             list_of_devices="`echo $l | sort -u`"
@@ -1312 +1311 @@
     # Coherency verification
     ML01=`cat $file | wc -l`
-    ML02=`cat $file | grep -v ' lvm ' | wc -l`
+    ML02=`grep -v ' lvm ' $file | wc -l`
     ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
-    ML2=`$AWK '{print $2}' $file | grep -v ' lvm ' | sort -u | wc -l`
+    ML2=`grep -v ' lvm ' $file | $AWK '{print $2}' | sort -u | wc -l`
     if [ "$ML01" -ne "$ML1" ]; then
         LogFile "--------------------------------------------"