[svn-commits] russell: trunk r2344 - in /trunk: ./ zaptel.init

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Mar 27 13:50:56 2007
New Revision: 2344

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2344
Log:
Merged revisions 2343 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2343 | russell | 2007-03-27 13:49:01 -0500 (Tue, 27 Mar 2007) | 13 lines

Merged revisions 2342 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2342 | russell | 2007-03-27 13:48:23 -0500 (Tue, 27 Mar 2007) | 5 lines

When debug is enabled, ensure that "debug=1" gets passed to the zaptel module,
and not just the hardware modules.  Also, run "ztcfg -s" at the beginning of
the "stop" action of the script.
(issue #7409, PCadach and tzafrir)

........

................

Modified:
    trunk/   (props changed)
    trunk/zaptel.init

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.init
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.init?view=diff&rev=2344&r1=2343&r2=2344
==============================================================================
--- trunk/zaptel.init (original)
+++ trunk/zaptel.init Tue Mar 27 13:50:56 2007
@@ -161,10 +161,10 @@
 	rmmod audio >& /dev/null
 	if [ $system = debian ]; then
 	    echo -n "Loading zaptel framework: " 
-	    modprobe zaptel >& /dev/null && echo -n "done"
+	    modprobe zaptel ${ARGS} >& /dev/null && echo -n "done"
 	    echo "."
 	elif [ $system = redhat ]; then
-	    action "Loading zaptel framework: " modprobe zaptel
+	    action "Loading zaptel framework: " modprobe zaptel ${ARGS}
 	fi
 	echo -n "Waiting for zap to come online..."
 	TMOUT=10 # max secs to wait
@@ -203,6 +203,7 @@
 	;;
   stop)
 	# Unload drivers
+	$ZTCFG -s
 	echo -n "Unloading zaptel hardware drivers:"
   	unload_module zaptel
 	RETVAL=$?