[dahdi-commits] sruffell: tools/trunk r4564 - in /tools/trunk: Makefile dahdi.init init.conf

[SVN commits to the DAHDI project]

Author: sruffell
Date: Mon Jul  7 16:10:58 2008
New Revision: 4564

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4564
Log:
Add commented out module names in init.conf and update the init script to
report when the MODULES parameter is empty at dahdi start.

Modified:
    tools/trunk/Makefile
    tools/trunk/dahdi.init
    tools/trunk/init.conf

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4564&r1=4563&r2=4564
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Mon Jul  7 16:10:58 2008
@@ -267,8 +267,8 @@
 	@echo "DAHDI has been configured."
 	@echo ""
 	@echo "If you have any DAHDI hardware it is now recommended to "
-	@echo "edit /etc/default/dahdi or /etc/sysconfig/dahdi and set there an "
-	@echo "optimal value for the variable MODULES ."
+	@echo "edit /etc/dahdi/init.conf and set there an optimal value "
+	@echo "for the variable MODULES ."
 	@echo ""
 	@echo "I think that the DAHDI hardware you have on your system is:"
 	@kernel/xpp/utils/dahdi_hardware || true

Modified: tools/trunk/dahdi.init
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi.init?view=diff&rev=4564&r1=4563&r2=4564
==============================================================================
--- tools/trunk/dahdi.init (original)
+++ tools/trunk/dahdi.init Mon Jul  7 16:10:58 2008
@@ -149,6 +149,12 @@
 case "$1" in
   start)
 	# Load drivers
+	if [ -z $MODULES ]; then
+		echo "There aren't any DAHDI hardware modules specified to "
+		echo "load.  Please update /etc/dahdi/init.conf in order to "
+		echo "specify the modules to load."
+		exit 1
+	fi
 	echo -n "Loading DAHDI hardware modules:"
 	for x in $MODULES; do 
 		eval localARGS="\$${x}_ARGS"

Modified: tools/trunk/init.conf
URL: http://svn.digium.com/view/dahdi/tools/trunk/init.conf?view=diff&rev=4564&r1=4563&r2=4564
==============================================================================
--- tools/trunk/init.conf (original)
+++ tools/trunk/init.conf Mon Jul  7 16:10:58 2008
@@ -11,3 +11,29 @@
 # Override settings for xpp_fxloader
 #XPP_FIRMWARE_DIR=/usr/share/dahdi
 #XPP_HOTPLUG_DISABLED=yes
+
+# By default, DAHDI will not load any modules.  Please uncomment the 
+# as per your requirements; modules to load/unload
+#Module Name			  Hardware
+#MODULES="$MODULES wct4xxp"	# TE405P - Quad Span T1/E1 Card (5v version)
+				# TE410P - Quad Span T1/E1 Card (3.3v version)
+#wct4xxp_ARGS="t1e1override=15"	# Additional parameters for TE4xxP driver
+# or use /etc/modprobe.d/zaptel or /etc/modprobe.conf .
+
+#MODULES="$MODULES wcte12xp"	# TE120P - Single Span T1/E1 Card
+
+#MODULES="$MODULES wct1xxp"	# T100P - Single Span T1 Card
+				# E100P - Single Span E1 Card
+
+#MODULES="$MODULES wcte11xp"	# TE110P - Single Span T1/E1 Card
+
+#MODULES="$MODULES wctdm24xxp"	# TDM2400P - Modular FXS/FXO interface (1-24 ports)
+
+#MODULES="$MODULES wcfxo"	# X100P - Single port FXO interface
+				# X101P - Single port FXO interface 
+
+#MODULES="$MODULES wctdm"	# TDM400P - Modular FXS/FXO interface (1-4 ports)
+
+#MODULES="$MODULES dahdi_dummy"	# Zaptel Timing Only Interface
+
+#MODULES="$MODULES xpp_usb"	# Xorcom Astribank Device