[svn-commits] sruffell: tools/trunk r4580 - in /tools/trunk: Makefile modprobe.conf.sample

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Jul  8 16:55:05 2008
New Revision: 4580

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

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

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4580&r1=4579&r2=4580
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Tue Jul  8 16:55:05 2008
@@ -62,8 +62,10 @@
   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))
@@ -261,6 +263,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)

Added: tools/trunk/modprobe.conf.sample
URL: http://svn.digium.com/view/dahdi/tools/trunk/modprobe.conf.sample?view=auto&rev=4580
==============================================================================
--- tools/trunk/modprobe.conf.sample (added)
+++ tools/trunk/modprobe.conf.sample Tue Jul  8 16:55:05 2008
@@ -1,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

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

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

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