Changeset 1993 in MondoRescue

Timestamp:

Jun 27, 2008, 8:03:27 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a problem with 3w_xxx module by using all possible bootbale modules in the CDROM_MODS list, rather than only the loaded one in the SCSI list

File:

• branches/2.2.7/mindi/mindi (modified) (3 diffs)

branches/2.2.7/mindi/mindi

@@ -54 +54 @@
 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"
-CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 $USB_MODS $PCMCIA_MODS"
 NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"
+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 raid5 raid456 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
 # Replace with that line for HP OCMP e.g.
@@ -2214 +2215 @@
 
     needed_modules=""
-    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
 
     if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
@@ -2320 +2321 @@
     return 0
 }
-
-
-WhichOfTheseModulesAreLoaded() {
-    local modname loaded_modules
-    loaded_modules="$MODULES"
-    for modname in $1 ; do
-        [ "`echo "$loaded_modules" | grep -w "$modname"`" ] && echo "$modname"
-    done
-}
-