[Pkg-voip-commits] r6381 - in /zaptel/trunk/debian: changelog zaptel.init

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Nov  3 07:39:22 2008
New Revision: 6381

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6381
Log:
* zaptel.init: exit on a different condition: Nicer handling of ztdummy.
* zaptel.init: Give a sane default to XPP_SYNC. 

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/zaptel.init

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=6381&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Mon Nov  3 07:39:22 2008
@@ -1,3 +1,10 @@
+zaptel (1:1.4.11~dfsg-3) unstable; urgency=low
+
+  * zaptel.init: exit on a different condition: Nicer handling of ztdummy.
+  * zaptel.init: Give a sane default to XPP_SYNC. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 03 Nov 2008 09:35:23 +0200
+
 zaptel (1:1.4.11~dfsg-2) unstable; urgency=low
 
   * Patch xpp_fxs_power: Fixed an issue with hook detection of the Astribank

Modified: zaptel/trunk/debian/zaptel.init
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.init?rev=6381&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.init (original)
+++ zaptel/trunk/debian/zaptel.init Mon Nov  3 07:39:22 2008
@@ -20,6 +20,7 @@
 NAME=zaptel
 DESC="Zaptel telephony kernel driver"
 FXOTUNE=/sbin/fxotune
+XPP_SYNC=auto
 
 # Include am defaults if available
 if [ -f /etc/default/zaptel ] ; then
@@ -28,11 +29,6 @@
 
 if [ ! -x $DAEMON ] ; then
 	echo >&2 $NAME ":" $DAEMON "fails test for exists and executable" ;
-	exit 0
-fi
-
-if [ ! -f $ZAPCONF_FILE ] ; then
-	echo >&2 $NAME ":" $ZAPCONF_FILE "fails test for exists and readable";
 	exit 0
 fi
 
@@ -113,15 +109,17 @@
 		#If we got here and we have no zaptel modules, there's
 		# no point to fail if zaptel-modules-version> is not
 		# installed.
-		if [ -d /proc/zaptel ]; then
-			$DAEMON $DAEMON_OPTS
-			echo "$NAME."
+		if [ ! -d /proc/zaptel ]; then
+			exit 0 # no modules loaded
 		fi
+
+		$DAEMON $DAEMON_OPTS
 
                 if [ -r /etc/fxotune.conf ] && [ -x $FXOTUNE ]; then
 			# fxotune will fail if e.g. Asterisk is already running.
                 	$FXOTUNE -s || :
                 fi
+		echo "$NAME."
 		;;
 	stop)
 		: # do nothing