[svn-commits] sruffell: tools/trunk r4581 - /tools/trunk/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Jul  8 17:14:09 2008
New Revision: 4581

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4581
Log:
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.


Added:
    tools/trunk/blacklist.sample   (with props)
Modified:
    tools/trunk/Makefile
    tools/trunk/modprobe.conf.sample

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4581&r1=4580&r2=4581
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Tue Jul  8 17:14:09 2008
@@ -66,6 +66,7 @@
 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))
@@ -266,6 +267,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)

Added: tools/trunk/blacklist.sample
URL: http://svn.digium.com/view/dahdi/tools/trunk/blacklist.sample?view=auto&rev=4581
==============================================================================
--- tools/trunk/blacklist.sample (added)
+++ tools/trunk/blacklist.sample Tue Jul  8 17:14:09 2008
@@ -1,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

Propchange: tools/trunk/blacklist.sample
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tools/trunk/blacklist.sample
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tools/trunk/blacklist.sample
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: tools/trunk/modprobe.conf.sample
URL: http://svn.digium.com/view/dahdi/tools/trunk/modprobe.conf.sample?view=diff&rev=4581&r1=4580&r2=4581
==============================================================================
--- tools/trunk/modprobe.conf.sample (original)
+++ tools/trunk/modprobe.conf.sample Tue Jul  8 17:14:09 2008
@@ -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