Changeset 3253 in MondoRescue for branches/3.2

Timestamp:

Feb 27, 2014, 3:48:28 AM (10 years ago)

Author:

Bruno Cornec

Message:

• mindo now uses mr-kernel-get-modules for automatic dependency analysis

File:

• branches/3.2/mindi/mindi (modified) (4 diffs)

branches/3.2/mindi/mindi

@@ -62 +62 @@
 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 hpsa 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 be2iscsi cxgb3i cxgb3 cxgb4i cxgb4 libcxgbi iscsi_boot_sysfs iscsi_target_mod iscsi_tcp libiscsi libiscsi2 scsi_transport_iscsi scsi_transport_iscsi2 libiscsi_tcp uio isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr 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 scsi_dh_emc scsi_dh_alua dc395x diskdumplib scsi_dump_register arcmsr stp garp"
+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 hpsa dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block ide-scsi ieee1394 imm in2000 initio ips iscsi be2iscsi cxgb3i cxgb3 cxgb4i cxgb4 uio isp megaraid megaraid_mbox megaraid_sas mega_sr mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule emcpdm emcpgpx emcpmpx emcp dc395x diskdumplib arcmsr"
 
 # 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 ide_gd_mod edd paride ata_generic ide_pci_generic ata_piix libata dock via82cxxx generic nvidia ahci libahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio virtio_ring virtio_pci virtio_blk virtio_balloon"
+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 edd paride ata_generic ata_piix dock via82cxxx generic nvidia ahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw virtio"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_common usb-common usb_storage input hid hid_generic uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
-NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 cnic be2net 8021q bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse crc32c libcrc32c netbk xenblktap r8169 virtio_net via_rhine garp lzo lzo_decompress lzo_compress ipv6 ptp ptp_pch pps_core"
-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 vfat fat"
+USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
+NET_MODS="nfs loop mii 3c59x e100 bcm5700 cnic be2net bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse netbk xenblktap r8169 virtio_net via_rhine ipv6 ptp"
+CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 vfat fat"
 # Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 raid6_pq async_raid6_recov async_pq xor async_tx async_memcpy async_xor 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 dm-region-hash dm-snapshot dm-log multipath jfs xfs btrfs zlib_deflate xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs vxodm vxgms vxglm gab llt dmpaa vxspec vxio vxdmp vxportal fdd vxfs "
+EXTRA_MODS="$CDROM_MODS loop md-mod lvm-mod dm-mod dm_mod dm-multipath dm-emc dm-hp-sw dm-rdac dm-region-hash multipath jfs xfs btrfs reiserfs ext2 ext3 minix nfs nfsd ext4 ocfs2 configfs vxfs "
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -525 +525 @@
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.org/downloads.shtml"
     LogFile "INFO: Found isolinux.bin at $ISOLINUX"
-}
-
-
-FindSpecificModuleInPath() {
-    local modpaths pwd line
-    pwd=`pwd`
-    cd /
-    if [ ! -e "$1" ] ; then
-        LogAll "WARNING: cannot search specific path '$1'"
-        return 1
-    fi
-    # Find all files and links (required for some VMWare VMs)
-    modpaths=`find "$1" -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2.ko.xz -o -name $2 -type f -o -type l`
-    echo "$modpaths"
-    cd "$pwd"
 }
 
@@ -2678 +2663 @@
     echo -en "..."
     cd /
-    if [ "${kernelname}" != "" ]; then
-        needed_modules_path=lib/modules/${kernelname}
-    else
-        needed_modules_path=lib/modules/$KERVERRUN
-    fi
 
     needed_modules=""
@@ -2699 +2679 @@
     done
 
-    [ -e "$needed_modules_path" ] || LogIt "WARNING: path $needed_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS."
-    for i in $list_of_groovy_mods ; do
-        needed_modules="$needed_modules `FindSpecificModuleInPath $needed_modules_path $i`"
-    done
-
-    for i in `echo $needed_modules  | tr ' ' '\n' | sort -u`; do
-        [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-        LogFile "INFO: Adding $i ($s KB) to the rootfs"
-        tar cf - -C / $i 2>> $MINDI_TMP/$$.log | (cd "$mountpoint" ; tar xf -) || LogIt "ERROR: Unable to copy $i to $mountpoint" $MINDI_TMP/$$.log
-        # Uncompress modules if not using udev and native modprobe
-        if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
-            if [ "`echo "$i" | grep -F ".gz"`" ]; then
-                LogFile "INFO: Uncompressing $i"
+    if [ "${kernelname}" != "" ]; then
+        needed_modules_path=lib/modules/${kernelname}
+        mkgmopt="-k $needed_modules_path"
+    else
+        needed_modules_path=lib/modules/$KERVERRUN
+        mkgmopt="-k $KERVERRUN"
+    fi
+
+    [ -e "$needed_modules_path" ] || LogIt "WARNING: path $needed_modules_path does not exist.\n         If you're not using a modular kernel then mindi won't probably work."
+    needed_modules=`mr-kernel-get-modules $mkgmopt $list_of_groovy_mods`
+
+    LogFile "INFO: Adding $needed_modules to the rootfs"
+    cp --parents -aL $needed_modules $mountpoint/ 2>> $MINDI_TMP/$$.log || LogIt "ERROR: Unable to copy modules to $mountpoint" $MINDI_TMP/$$.log
+
+    # Uncompress modules if not using udev and native modprobe
+    if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
+        for i in $needed_modules; do
+            if [ "`echo "$i" | grep -E ".gz$"`" ]; then
                 gunzip -f $mountpoint/$i
             fi
-        fi
-        if [ -L $mountpoint/$i ] && [ `echo "$i" | grep "\.ko$"` ]; then
-            echo "Replacing module symlink ($i) with actual file"
-            rm -f $mountpoint/$i
-            cp -Lf $i $mountpoint/$i
-            ls -l $mountpoint/$i
-        fi
-    done
+            if [ "`echo "$i" | grep -E ".bz$"`" ]; then
+                bunzip2 -f $mountpoint/$i
+            fi
+            if [ "`echo "$i" | grep -E ".xz$"`" ]; then
+                unxz -f $mountpoint/$i
+            fi
+            LogFile "INFO: Uncompressing $i"
+        done
+    fi
 
     # Also copy modules.* in case of udev so that normal modprobe works