diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-12-01 16:13:08 -0500 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-12-01 16:26:10 -0500 |
| commit | 8745b48114ef1f9ca94cd67a874f5529a7c62c7e (patch) | |
| tree | 32e3f3e2a5507ffa7237a41955229ea731fcbbe5 /scripts/mk-images | |
| parent | 8e454a4309f4296b266534703138688d81a0576d (diff) | |
| download | anaconda-8745b48114ef1f9ca94cd67a874f5529a7c62c7e.tar.gz anaconda-8745b48114ef1f9ca94cd67a874f5529a7c62c7e.tar.xz anaconda-8745b48114ef1f9ca94cd67a874f5529a7c62c7e.zip | |
Use modules.* files for finding modules of a type rather than modinfo
Use the modules.* files for finding modules of a type rather than the
modinfo and then pull in drm modules using it rather than
having to explicitly list them. (#446126)
Diffstat (limited to 'scripts/mk-images')
| -rwxr-xr-x | scripts/mk-images | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 3b480cb4b..a405df792 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -117,8 +117,7 @@ LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-cry RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" -DRMMODS="drm i810 i830 i915 mga nouveau r128 radeon savage sis tdfx via" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $DRMMODS $SDMODS =scsi =net" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $SDMODS =scsi =net =drm" . $(dirname $0)/buildinstall.functions @@ -261,7 +260,16 @@ expandModuleSet() { char=$(echo $name | cut -c1) if [ $char = '=' ]; then NAME=$(echo $name | cut -c2-) - SET="$SET $($MODLIST --modinfo-file $MODINFO $NAME)" + if [ "$NAME" = "ata" ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block |egrep '(ata|ahci)' |sed -e 's/.ko//')" + elif [ "$NAME" = "scsi" ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block) |sed -e 's/.ko//')" + else + # Ignore if group list does not exist + if [ -e $MBD_DIR/lib/modules/$kernel/modules.$NAME ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.$NAME |sed -e 's/.ko//')" + fi + fi else SET="$SET $name" fi |