[svn-commits] tzafrir: tools/trunk r4586 - in /tools/trunk: init.conf.sample modules.sample

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jul  9 04:18:50 2008
New Revision: 4586

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4586
Log:
* Remove the settings of MODULES= from the sample init.conf .
* Don't load dahdi_dummy by default (we modprobe for it in the same
  init.d script anyway).
* Document the format of the modules file.

Modified:
    tools/trunk/init.conf.sample
    tools/trunk/modules.sample

Modified: tools/trunk/init.conf.sample
URL: http://svn.digium.com/view/dahdi/tools/trunk/init.conf.sample?view=diff&rev=4586&r1=4585&r2=4586
==============================================================================
--- tools/trunk/init.conf.sample (original)
+++ tools/trunk/init.conf.sample Wed Jul  9 04:18:50 2008
@@ -11,6 +11,9 @@
 # Override settings for xpp_fxloader
 #XPP_FIRMWARE_DIR=/usr/share/dahdi
 #XPP_HOTPLUG_DISABLED=yes
+
+# Modules configuration was in this file in Zaptel. In DAHDI it was
+# moved to /etc/dahdi/modules . Refer to Refer to modules.sample .
 
 # By default, DAHDI will not load any modules.  Please uncomment the 
 # as per your requirements; modules to load/unload

Modified: tools/trunk/modules.sample
URL: http://svn.digium.com/view/dahdi/tools/trunk/modules.sample?view=diff&rev=4586&r1=4585&r2=4586
==============================================================================
--- tools/trunk/modules.sample (original)
+++ tools/trunk/modules.sample Wed Jul  9 04:18:50 2008
@@ -3,12 +3,15 @@
 # NOTE:  Please add/edit /etc/modprobe.d/dahdi or /etc/modprobe.conf if you 
 #        would like to add any module parameters.
 #
+# Format of this file: list of modules, each in its own line. 
+# Anything after a '#' is ignore, likewise trailing and leading
+# whitespaces and empty lines.
 
 # TE405P - Quad Span T1/E1 Card (5v version)
 # TE410P - Quad Span T1/E1 Card (3.3v version)
 wct4xxp
 
-# TE120P - Single Span T1/E1 Card
+# * TE120P - Single Span T1/E1 Card
 wcte12xp
 
 # T100P - Single Span T1 Card
@@ -30,8 +33,11 @@
 # TDM400P - Modular FXS/FXO interface (1-4 ports)
 wctdm
 
-# DAHDI timing only interface
-dahdi_dummy
+# DAHDI timing only interface. Disabled by default, as it will be loaded
+# by the init.d script in case no hardware is found.
+#
+# If you have no hardware, enable it and disable others.
+#dahdi_dummy 
 
 # Xorcom Astribank Device
 xpp_usb