From cfd61537b47387b0fb5c8228baad6cec16d8f6e6 Mon Sep 17 00:00:00 2001
From: tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Tue, 18 Dec 2007 14:31:07 +0000
Subject: xpp r5151:   * xpd_pri: Basically ready.   * PCM synchronization
 changes:     - Each Astribank unit ticks independently. Each with its own
 PLL.     - HOST synchronization is gone. Loading of xpp will no longer cause 
      useless 250 ticks per second if you have no Astribank.     -
 Synchronization from the zaptel sync master requires setting       ZAPTEL as
 sync source (xpp_sync ZAPTEL).   * rx_tasklet is now a parameter of the
 module xpp, rather than of xpp_usb.   * New FPGA firmware: 5128 (1151) / 5122
 (1141, 1131):     - Fixes synchronization issues.     - PRI module: E1 should
 now work.   * perl module and utilities:     - Modules no longer magically
 scan system on initialization.     - Scanning is by calling explicit methods.
     - "Serial" has been renamed "Label". It is basically unique, but      
 should be modifieble.     - Some basic documentation of zaptel perl modules. 
  * Default sort order of zt_registration is back to SORT_CONNCTOR.   *
 zt_registration proc file now shows the number of span registered to     if
 registered. Try: grep . /proc/xpp/XBUS-*/XPD-*/zt_registration   *
 genzaptelconf: Allow using a custom command instead of    
 /etc/init.d/asterisk to start/stop asterisk.   * Fixed the typo "Slagish".

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3506 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 xpp/utils/genzaptelconf | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'xpp/utils/genzaptelconf')

diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf
index 47ef409..8cbf3ed 100755
--- a/xpp/utils/genzaptelconf
+++ b/xpp/utils/genzaptelconf
@@ -104,6 +104,13 @@ ZAPBRI_SIGNALLING=bri_ptmp
 #ZAPBRI_SIGNALLING=pri
 zapconf_def_termtype=te
 
+# A command to stop / start asterisk. Must support parameters "start"
+# and "stop" . This is the executable:
+ZAPCONF_ASTERISK_SCRIPT=/etc/init.d/asterisk
+#
+# Should you need to pass extra arguments:
+ZAPCONF_ASTERISK_CMD=$ZAPCONF_ASTERISK_SCRIPT
+
 # read default configuration from /etc/default/zaptel
 if [ -r $ZAPTEL_BOOT_DEBIAN ]; then . $ZAPTEL_BOOT_DEBIAN; fi
 if [ -r $ZAPTEL_BOOT_FEDORA ]; then . $ZAPTEL_BOOT_FEDORA; fi
@@ -1110,7 +1117,7 @@ defaultzone=$loadzone
 # make sure asterisk is not in our way
 if [ "$force_stop_ast" = 'yes' ]
 then
-	/etc/init.d/asterisk stop 1>&2
+	$ZAPCONF_ASTERISK_CMD stop 1>&2
 else
   # if asterisk is running and we wanted to detect modules
 	# or simply to unload modules, asterisk needs to go away.
@@ -1166,9 +1173,9 @@ then
 	exit_cleanup 0
 fi
 
-if [ -x /etc/init.d/asterisk ]
+if [ -x "$ZAPCONF_ASTERISK_SCRIPT" ]
 then
-	/etc/init.d/asterisk start 1>&2
+	$ZAPCONF_ASTERISK_CMD start 1>&2
 fi
 
 # if in verbose mode: verify that asterisk is running
-- 
cgit v1.2.3