[svn-commits] tzafrir: trunk r2716 - /trunk/zaptel.init

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jul 11 08:22:25 2007
New Revision: 2716

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2716
Log:
A more robust modules loading order, IMHO.

If this breaks, the first thing to try is to remove faulty run of zaptel
from modprobe.conf .

Modified:
    trunk/zaptel.init

Modified: trunk/zaptel.init
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.init?view=diff&rev=2716&r1=2715&r2=2716
==============================================================================
--- trunk/zaptel.init (original)
+++ trunk/zaptel.init Wed Jul 11 08:22:25 2007
@@ -164,17 +164,21 @@
 # See how we were called.
 case "$1" in
   start)
-	# Load drivers
-	rmmod wcusb 2> /dev/null
-	rmmod wcfxsusb 2> /dev/null
-	rmmod audio 2> /dev/null
-	if [ $system = debian ]; then
-	    echo -n "Loading zaptel framework: " 
-	    modprobe zaptel ${ARGS} 2> /dev/null && echo -n "done"
-	    echo "."
-	elif [ $system = redhat ]; then
-	    action "Loading zaptel framework: " modprobe zaptel ${ARGS}
-	fi
+	#if [ $system = debian ]; then
+	#    echo -n "Loading zaptel framework: " 
+	#    modprobe zaptel ${ARGS} 2> /dev/null && echo -n "done"
+	#    echo "."
+	#elif [ $system = redhat ]; then
+	#    action "Loading zaptel framework: " modprobe zaptel ${ARGS}
+	#fi
+	echo -n "Loading zaptel hardware modules:"
+	for x in $MODULES; do 
+		eval localARGS="\$${x}_ARGS"
+		if modprobe ${x} ${ARGS} ${localARGS} 2> /dev/null; then
+			echo -n " $x"
+		fi
+	done
+	xpp_startup
 	echo -n "Waiting for zap to come online..."
 	TMOUT=10 # max secs to wait
 	while [ ! -d /dev/zap ] ; do
@@ -186,16 +190,7 @@
 		fi
 	done
 	echo "OK"
-	echo -n "Loading zaptel hardware modules:"
-	for x in $MODULES; do 
-		eval localARGS="\$${x}_ARGS"
-		if modprobe ${x} ${ARGS} ${localARGS} 2> /dev/null; then
-			echo -n " $x"
-		fi
-	done
-	sleep 3 # TODO: remove it
-	
-	xpp_startup
+	#sleep 3 # TODO: remove it
 	
 	if head -c 0 /dev/zap/pseudo; then 
 		echo "No Zaptel timing source sound. loading ztdummy"