[svn-commits] tzafrir: branch 1.4 r3570 - /branches/1.4/live_zap

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Fri Dec 28 18:46:07 2007
New Revision: 3570

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3570
Log:
* modules now can take parameters from live.conf (${module}_ARGS).
* zapconf's settings are taken from live.conf .
* Added 'reload' for 'unload; load' .

Modified:
    branches/1.4/live_zap

Modified: branches/1.4/live_zap
URL: http://svn.digium.com/view/zaptel/branches/1.4/live_zap?view=diff&rev=3570&r1=3569&r2=3570
==============================================================================
--- branches/1.4/live_zap (original)
+++ branches/1.4/live_zap Fri Dec 28 18:46:07 2007
@@ -24,7 +24,7 @@
 if [ -r $DESTDIR/live.conf ]; then . $DESTDIR/live.conf; fi
 
 # Detect the modules used in the system:
-for mod in `xpp/utils/zaptel_modules`; do
+for mod in `xpp/utils/zaptel_drivers`; do
 	case "$mod" in
 		xpp_usb) 
 			MODULES_LOAD="$MODULES_LOAD xpp/xpp xpp/xpd_fxs"
@@ -136,9 +136,12 @@
 	# TODO: Find a way to use modprobe.
 	# Or implement a way to pass arguments to modules here (yuck)
 	for module in $MODULES_LOAD; do
-		insmod $MODULES_DIR/$module.ko
+		eval module_args="\$`basename ${module}`_ARGS"
+		insmod $MODULES_DIR/$module.ko $module_args
 	done
 	xpp_startup
+	ZAPTEL_BOOT_DEBIAN=$DESTDIR/live.conf \
+	ZAPTEL_BOOT_FEDORA=$DESTDIR/live.conf \
 	ZAPTEL_FILE=$DESTDIR/etc/zaptel.conf \
 	ZAPATA_FILE=$DESTDIR/etc/asterisk/zapata-channels.conf \
 		zapconf
@@ -150,6 +153,10 @@
 	# doable, but trickier.
 	$AST_SCRIPT start
 	;;
+reload)
+	$0 unload
+	$0 load
+	;;
 help)
 	usage
 	;;