[svn-commits] tzafrir: linux/trunk r8814 - /linux/trunk/build_tools/live_dahdi

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Jun 28 05:25:34 2010
New Revision: 8814

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8814
Log:
live_dahdi: regen config or restart asterisk without full reload

Adds commands 'genconf' (for basically: dahdi_genconf; dahdi_cfg) and
'asterisk' (start asterisk) so doing those should not require a full
restart.

Modified:
    linux/trunk/build_tools/live_dahdi

Modified: linux/trunk/build_tools/live_dahdi
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/build_tools/live_dahdi?view=diff&rev=8814&r1=8813&r2=8814
==============================================================================
--- linux/trunk/build_tools/live_dahdi (original)
+++ linux/trunk/build_tools/live_dahdi Mon Jun 28 05:25:34 2010
@@ -144,6 +144,20 @@
 	rmmod $module
 }
 
+genconf() {
+	GENCONF_PARAMETERS=$DESTDIR/etc/dahdi/genconf_parameters \
+	DAHDI_CONF_FILE=$DESTDIR/etc/dahdi/system.conf \
+	DAHDI_MODS_FILE=$DESTDIR/etc/dahdi/modules \
+	CHAN_DAHDI_CHANNELS_FILE=$DESTDIR/etc/asterisk/dahdi-channels.conf \
+		dahdi_genconf
+	dahdi_cfg -c $DESTDIR/etc/dahdi/system.conf
+	# TODO: fxotune, hpec
+}
+
+run_asterisk() {
+	$AST_SCRIPT start
+}
+
 usage() {
 	me=`basename $0`
 	echo "$me: Run DAHDI in a test environment"
@@ -157,6 +171,8 @@
 	echo "$me load           /etc/init.d/dahdi start"
 	echo "$me reload         /etc/init.d/dahdi restart"
 	echo "$me xpp-firm       (Reset and load xpp firmware)"
+	echo "$me genconf        dahdi_genconf; dahdi_cfg"
+	echo "$me asterisk       /etc/init.d/asterisk start"
 	echo "$me rsync TARGET   (copy filea to /tmp/live in host TARGET)"
 	echo "$me exec  COMMAND  (Run COMMAND in 'live' environment)"
 	echo ""
@@ -207,18 +223,18 @@
 		insmod $MODULES_DIR/$module.ko $module_args
 	done
 	xpp_startup
-	GENCONF_PARAMETERS=$DESTDIR/etc/dahdi/genconf_parameters \
-	DAHDI_CONF_FILE=$DESTDIR/etc/dahdi/system.conf \
-	DAHDI_MODS_FILE=$DESTDIR/etc/dahdi/modules \
-	CHAN_DAHDI_CHANNELS_FILE=$DESTDIR/etc/asterisk/dahdi-channels.conf \
-		dahdi_genconf
-	dahdi_cfg -c $DESTDIR/etc/dahdi/system.conf
-	# TODO: fxotune, hpec
+	genconf
 	# or find a way to reuse init.d start sequence.
 
 	# TODO: A local copy of Asterisk, configured with dahdi_gnconf. 
 	# doable, but trickier.
-	$AST_SCRIPT start
+	run_asterisk
+	;;
+genconf)
+	genconf
+	;;
+asterisk)
+	run_asterisk
 	;;
 reload)
 	$0 unload