This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via e2e106be5633b49ac9391ea187c39f6f777596d3 (commit) via efa8b61522a5941f460d797034dcdf926fd3f894 (commit) from dcfb85496acf7a095fec78047be439697166f808 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit e2e106be5633b49ac9391ea187c39f6f777596d3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jun 19 18:37:51 2010 +0200

Update isdn modul blacklisting.

commit efa8b61522a5941f460d797034dcdf926fd3f894 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jun 19 13:51:55 2010 +0200

Blacklist matroxfb.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/linux | 1 + config/udev/blacklist | 28 ---------------------------- lfs/linux | 7 +++++++ 3 files changed, 8 insertions(+), 28 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux index bf979d3..adc8316 100644 --- 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 1085bf4..5e470a9 100644 --- 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 68e7df4..8e1c702 100644 --- a/lfs/linux +++ b/lfs/linux @@ -189,6 +189,8 @@ endif # rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN

ifneq "$(XEN)" "1" + # Blacklist matroxfb_base + 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 ; \ @@ -198,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-*

hooks/post-receive -- IPFire 2.x development tree