Update isdn modul blacklisting.

diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index bf979d3965adbe7210eee33076876b7a5b7e339d..adc8316eb8175534e180e9de8e83b4808e6b74af 100644 (file)
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -4,6 +4,7 @@ boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire
 boot/vmlinuz-ipfire
 etc/modprobe.d/framebuffer
+etc/modprobe.d/isdn
 #lib/firmware/keyspan/usa19qi.fw
 lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/build

diff --git a/config/udev/blacklist b/config/udev/blacklist
index 1085bf4fdba79724da705fa59d08df87b010e788..5e470a9caedd7a138f4d27b648055f7bca3d18d4 100644 (file)
--- a/config/udev/blacklist
+++ b/config/udev/blacklist
@@ -1,30 +1,2 @@
-blacklist hisax
-blacklist hisax_fcpcipnp
-blacklist hisax_isac
 blacklist crc_ccitt
-blacklist isdn
 blacklist slhc
-blacklist capi
-blacklist capifs
-blacklist kernelcapi
-blacklist kernel_capi
-blacklist avmfritz
-blacklist hfcmulti
-blacklist mISDN_core
-blacklist mISDN_l1
-blacklist mISDN_l2
-blacklist l3udss1
-blacklist mISDN_capi
-blacklist mISDN_isac
-blacklist hfcsusb
-blacklist hfcpci
-blacklist hfcsmini
-blacklist l1oip
-blacklist mISDN_dsp
-blacklist netjetpci
-blacklist sedlfax
-blacklist w6692pci
-blacklist xhfc
-blacklist mISDNinfineon
-blacklist avmfritz
-blacklist speedfax

diff --git a/lfs/linux b/lfs/linux
index 49a079488ab5f492e76e780c27786e4305fa1332..8e1c7021efc3f7335b2fe992b59f72766db7f197 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -190,7 +190,7 @@ endif
 
 ifneq "$(XEN)" "1"
        # Blacklist matroxfb_base
-       echo "blacklist matroxfb_base >> /etc/modprobe.d/framebuffer
+       echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
        # Blacklist old framebuffer modules
        for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
@@ -200,6 +200,11 @@ ifneq "$(XEN)" "1"
                echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
        done
        sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+
+       # Blacklist isdn modules
+       for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
+               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+       done
 endif
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*