summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2008-07-08 21:55:05 +0000
committerShaun Ruffell <sruffell@digium.com>2008-07-08 21:55:05 +0000
commit3ac8a605e21d12c324389d1fa37766388701570d (patch)
treefd62e113b839701b41377dcf6f6877e71c751388
parent0a0e54e558f099c49208e5d2e474808891ad843d (diff)
Adding all the modules to the system blacklist by default on "make config".
This module list is just hardcoded in modprobe.conf.sample. It probably should be based on the modules that are about to be installed...but that will need to wait until later. git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4580 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--Makefile5
-rw-r--r--modprobe.conf.sample18
2 files changed, 23 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8f206d1..8f9494b 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,10 @@ ifneq (,$(INITRD_DIR))
INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/dahdi
COPY_INITD := install -D dahdi.init $(INIT_TARGET)
endif
+
RCCONF_FILE = /etc/dahdi/init.conf
MODULES_FILE = /etc/dahdi/modules
+MODPROBE_FILE = /etc/modprobe.d/dahdi
NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts ))
ifneq (,$(NETSCR_DIR))
@@ -262,6 +264,9 @@ endif
ifeq (,$(wildcard $(DESTDIR)$(MODULES_FILE)))
$(INSTALL) -D -m 644 modules.sample $(DESTDIR)$(MODULES_FILE)
endif
+ifeq (,$(wildcard $(DESTDIR)$(MODPROBE_FILE)))
+ $(INSTALL) -D -m 644 modprobe.conf.sample $(DESTDIR)$(MODPROBE_FILE)
+endif
ifneq (,$(COPY_NETSCR))
$(COPY_NETSCR)
endif
diff --git a/modprobe.conf.sample b/modprobe.conf.sample
new file mode 100644
index 0000000..20a4b48
--- /dev/null
+++ b/modprobe.conf.sample
@@ -0,0 +1,18 @@
+# You should place any module parameters for your DAHDI modules here
+# Example:
+#
+# options wctdm24xxp latency=6
+
+# blacklist all the drivers by default in order to ensure that
+# /etc/init.d/dahdi installs them in the correct order so that the spans are
+# ordered consistently.
+
+blacklist wct4xxp
+blacklist wcte12xp
+blacklist wct1xxp
+blacklist wcte11xp
+blacklist wctdm24xxp
+blacklist wcfxo
+blacklist wctdm
+blacklist xpp_usb
+blacklist wctc4xxp