Added a modprobe.conf dir.

diff --git a/config/modprobe.d/blacklist b/config/modprobe.d/blacklist
new file mode 100644 (file)
index 0000000..6b11a13
--- /dev/null
+++ b/config/modprobe.d/blacklist
@@ -0,0 +1,37 @@
+#
+# Listing a module here prevents the hotplug scripts from loading it.
+# Usually that'd be so that some other driver will bind it instead,
+# no matter which driver happens to get probed first.  Sometimes user
+# mode tools can also control driver binding.
+#
+# Syntax:  driver name alone (without any spaces) on a line. Other
+# lines are ignored.
+#
+
+# watchdog drivers
+blacklist i8xx_tco
+
+# framebuffer drivers
+blacklist aty128fb
+blacklist atyfb
+blacklist radeonfb
+blacklist i810fb
+blacklist cirrusfb
+blacklist intelfb
+blacklist kyrofb
+blacklist i2c-matroxfb
+blacklist hgafb
+blacklist nvidiafb
+blacklist rivafb
+blacklist savagefb
+blacklist sstfb
+blacklist neofb
+blacklist tridentfb
+blacklist tdfxfb
+blacklist virgefb
+blacklist vga16fb
+
+# ISDN - see bugs 154799, 159068
+blacklist hisax
+blacklist hisax_fcpcipnp
+

diff --git a/config/modprobe.d/modprobe.conf.dist b/config/modprobe.d/modprobe.conf.dist
new file mode 100644 (file)
index 0000000..2f053cc
--- /dev/null
+++ b/config/modprobe.d/modprobe.conf.dist
@@ -0,0 +1,167 @@
+# default modutils aliases
+alias binfmt-204 binfmt_aout
+alias binfmt-263 binfmt_aout
+alias binfmt-264 binfmt_aout
+alias binfmt-267 binfmt_aout
+alias binfmt-387 binfmt_aout
+alias block-major-1-* rd
+alias block-major-3-* ide-probe-mod
+alias block-major-8-* sd_mod
+alias block-major-9-* md
+alias block-major-11-* sr_mod
+alias block-major-13-* xd
+alias block-major-15-* cdu31a
+alias block-major-16-* gscd
+alias block-major-17-* optcd
+alias block-major-18-* sjcd
+alias block-major-20-* mcdx
+alias block-major-22-* ide-probe-mod
+alias block-major-23-* mcd
+alias block-major-24-* sonycd535
+alias block-major-25-* sbpcd
+alias block-major-26-* sbpcd
+alias block-major-27-* sbpcd
+alias block-major-29-* aztcd
+alias block-major-32-* cm206
+alias block-major-33-* ide-probe-mod
+alias block-major-34-* ide-probe-mod
+alias block-major-37-* ide-tape
+alias block-major-44-* ftl
+alias block-major-46-* pcd
+alias block-major-47-* pf
+alias block-major-56-* ide-probe-mod
+alias block-major-57-* ide-probe-mod
+alias block-major-88-* ide-probe-mod
+alias block-major-89-* ide-probe-mod
+alias block-major-90-* ide-probe-mod
+alias block-major-91-* ide-probe-mod
+alias block-major-93-* nftl
+alias block-major-113-* viocd
+alias char-major-4-* serial
+alias char-major-5-* serial
+alias char-major-9-* st
+alias char-major-10-2 msbusmouse
+alias char-major-10-3 atixlmouse
+alias char-major-10-135 rtc
+alias char-major-10-139 openprom
+alias char-major-10-157 applicom
+alias char-major-10-175 agpgart
+alias char-major-10-250 hci_vhci
+alias char-major-13-* input
+alias char-major-13-0 joydev
+alias char-major-13-32 mousedev
+alias char-major-19-* cyclades
+alias char-major-20-* cyclades
+alias char-major-22-* pcxx
+alias char-major-23-* pcxx
+alias char-major-27-* zftape
+alias char-major-34-* scc
+alias char-major-35-* tclmidi
+alias char-major-36-* netlink
+alias char-major-48-* riscom8
+alias char-major-49-* riscom8
+alias char-major-57-* esp
+alias char-major-58-* esp
+alias char-major-63-* kdebug
+alias char-major-90-* mtdchar
+alias char-major-96-* pt
+alias char-major-97-* pg
+alias char-major-107-* 3dfx
+alias char-major-109-* lvm-mod
+alias char-major-188-* usbserial
+alias char-major-200-* vxspec
+alias char-major-206-* osst
+alias char-major-216-* rfcomm
+alias dos msdos
+alias dummy0 dummy
+alias dummy1 dummy
+alias iso9660 isofs
+alias net-pf-1 unix
+alias net-pf-2 ipv4
+alias net-pf-17 af_packet
+alias netalias-2 ip_alias
+alias irlan0 irlan
+alias irda-dongle-0 tekram
+alias irda-dongle-1 esi
+alias irda-dongle-2 actisys
+alias irda-dongle-3 actisys
+alias irda-dongle-4 girbil
+alias irda-dongle-5 litelink
+alias irda-dongle-6 airport
+alias irda-dongle-7 old_belkin
+alias plip0 plip
+alias plip1 plip
+alias tunl0 ipip
+alias cipcb0 cipcb
+alias cipcb1 cipcb
+alias cipcb2 cipcb
+alias cipcb3 cipcb
+alias slip0 slip
+alias slip1 slip
+alias tty-ldisc-1 slip
+alias tty-ldisc-3 ppp_async
+alias tty-ldisc-11 irtty-sir
+alias tty-ldisc-14 ppp_synctty
+alias tty-ldisc-15 hci_uart
+alias ppp-compress-18 ppp_mppe
+install ppp-compress-21 /bin/true
+alias ppp-compress-24 ppp_deflate
+alias ppp-compress-26 ppp_deflate
+alias parport_lowlevel parport_pc
+alias usbdevfs usbcore
+alias xfrm-type-2-50 esp4
+alias xfrm-type-2-51 ah4
+alias xfrm-type-2-108 ipcomp
+alias xfrm-type-10-50 esp6
+alias xfrm-type-10-51 ah6
+alias xfrm-type-10-108 ipcomp6
+alias cipher_null crypto_null
+alias digest_null crypto_null
+alias compress_null crypto_null
+alias sha384 sha512
+install binfmt-0000 /bin/true
+install binfmt_misc /sbin/modprobe --first-time --ignore-install binfmt_misc && { /bin/mount -t binfmt_misc none /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; }
+install nfsd /sbin/modprobe --first-time --ignore-install nfsd && { /bin/mount -t nfsd nfsd /proc/fs/nfsd > /dev/null 2>&1 || :; }
+install sunrpc /sbin/modprobe --first-time --ignore-install sunrpc && { /bin/mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; }
+install char-major-10 /bin/true
+install char-major-10-1 /bin/true
+install dummy0 /sbin/modprobe -o dummy0 --ignore-install dummy
+install dummy1 /sbin/modprobe -o dummy1 --ignore-install dummy
+install net-pf-19 /bin/true
+install net-pf-3 /bin/true
+install net-pf-6 /bin/true
+install ov518_decomp { /sbin/modprobe ov511; } ; /sbin/modprobe --first-time --ignore-install ov518_decomp
+install scsi_hostadapter /bin/true
+install usbmouse /sbin/modprobe --first-time --ignore-install usbmouse && { /sbin/modprobe hid; /bin/true; }
+remove binfmt_misc { /bin/umount /proc/sys/fs/binfmt_misc > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove binfmt_misc
+remove ov518_decomp /sbin/modprobe -r --first-time --ignore-remove ov518_decomp && { /sbin/modprobe -r ov511; /bin/true; }
+remove usbmouse { /sbin/modprobe -r hid; } ; /sbin/modprobe -r --first-time --ignore-remove usbmouse
+remove sunrpc { /bin/umount /var/lib/nfs/rpc_pipefs > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --ignore-remove sunrpc
+remove nfsd { /bin/umount /proc/fs/nfsd > /dev/null 2>&1 || :; } ; /sbin/modprobe -r --first-time --ignore-remove nfsd
+
+
+alias usb-uhci uhci-hcd
+alias usb-ohci ohci-hcd
+alias uhci uhci-hcd
+
+alias char-major-116-* snd
+alias sound-service-*-0 snd-mixer-oss
+alias sound-service-*-1 snd-seq-oss
+alias sound-service-*-3 snd-pcm-oss
+alias sound-service-*-8 snd-seq-oss
+alias sound-service-*-12 snd-pcm-oss
+
+install sound-slot-* /sbin/modprobe snd-card-${MODPROBE_MODULE##sound[_-]slot[_-]}
+
+install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss
+
+alias nfs4 nfs
+alias rpc_pipefs sunrpc
+alias rpc_svc_gss_pipefs sunrpc
+
+install eth1394 /bin/true
+
+install snd-emu10k1 /sbin/modprobe --ignore-install snd-emu10k1 && /sbin/modprobe snd-emu10k1-synth
+
+alias gre0 ip_gre
+alias char-major-89-* i2c-dev

diff --git a/lfs/stage2 b/lfs/stage2
index bde69e53c30123f9f17b6f9397f9f98d972bd4dd..d906ec8c622fed7d794431bcf64fb0fcc625a31d 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -95,6 +95,8 @@ $(TARGET) :
        for i in $(DIR_SRC)/config/etc/*; do \
                [ -f $$i ] && cp $$i /etc; \
        done
+       -mkdir -pv /etc/modprobe.d
+       cp -av $(DIR_CONF)/modprobe.d/* /etc/modprobe.d/
 
 ifeq "$(EMB)" "1"
        # Enable serial on console 7