diff options
author | Shaun Ruffell <sruffell@digium.com> | 2008-07-08 22:14:09 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2008-07-08 22:14:09 +0000 |
commit | 55b9e0fc906d06a91e34d1d864c884c9144b61b1 (patch) | |
tree | 0831e5221d2498842020eb6959050af19fe5e1d7 | |
parent | 3ac8a605e21d12c324389d1fa37766388701570d (diff) |
Split up modprobe.conf.sample into one file for options, and another file for
the blacklist. This way updating the blacklist in a future release will not
necessarily overwrite any of the users options.
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4581 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | blacklist.sample | 13 | ||||
-rw-r--r-- | modprobe.conf.sample | 14 |
3 files changed, 17 insertions, 14 deletions
@@ -66,6 +66,7 @@ endif RCCONF_FILE = /etc/dahdi/init.conf MODULES_FILE = /etc/dahdi/modules MODPROBE_FILE = /etc/modprobe.d/dahdi +BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts )) ifneq (,$(NETSCR_DIR)) @@ -267,6 +268,9 @@ endif ifeq (,$(wildcard $(DESTDIR)$(MODPROBE_FILE))) $(INSTALL) -D -m 644 modprobe.conf.sample $(DESTDIR)$(MODPROBE_FILE) endif +ifeq (,$(wildcard $(DESTDIR)$(BLACKLIST_FILE))) + $(INSTALL) -D -m 644 blacklist.sample $(DESTDIR)$(BLACKLIST_FILE) +endif ifneq (,$(COPY_NETSCR)) $(COPY_NETSCR) endif diff --git a/blacklist.sample b/blacklist.sample new file mode 100644 index 0000000..4a6fcf7 --- /dev/null +++ b/blacklist.sample @@ -0,0 +1,13 @@ +# 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 diff --git a/modprobe.conf.sample b/modprobe.conf.sample index 20a4b48..1570d00 100644 --- a/modprobe.conf.sample +++ b/modprobe.conf.sample @@ -2,17 +2,3 @@ # 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 |