* modules now can take parameters from live.conf (${module}_ARGS).

* zapconf's settings are taken from live.conf .
* Added 'reload' for 'unload; load' .


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3570 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 9 insertions, 2 deletions

diff --git a/live_zap b/live_zap
index 4f65122..524564b 100755
--- a/live_zap
+++ b/live_zap
@@ -24,7 +24,7 @@ REMOVE_MODULES="zaptel"
 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 @@ load)
 	# 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 @@ load)
 	# doable, but trickier.
 	$AST_SCRIPT start
 	;;
+reload)
+	$0 unload
+	$0 load
+	;;
 help)
 	usage
 	;;