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

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Dec  1 11:22:00 2007
New Revision: 4960

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4960
Log:
* Don't run ztcfg if zaptel was not loaded. But do fail if ztcfg has failed.
  (Closes: #407996).

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=4960&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sat Dec  1 11:22:00 2007
@@ -16,6 +16,8 @@
   * Call 'make dist-clean' rather than 'make clean'.
   * Don't run 'make dist-clean' on zaptel-modules build.
   * Document zaptel-modules build test.
+  * Don't run ztcfg if zaptel was not loaded. But do fail if ztcfg has failed.
+    (Closes: #407996).
 
   [ Faidon Liambotis ]
   * Don't delete old device nodes on installations since it's needed only for

Modified: zaptel/trunk/debian/zaptel.init
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.init?rev=4960&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.init (original)
+++ zaptel/trunk/debian/zaptel.init Sat Dec  1 11:22:00 2007
@@ -109,8 +109,14 @@
 		fi
 
 		# configure existing modules:
-		$DAEMON $DAEMON_OPTS || echo -n $DAEMON "failed. Check" $ZAPCONF_FILE
-		echo "$NAME."
+
+		#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."
+		fi
 
                 if [ -r /etc/fxotune.conf ] && [ -x $FXOTUNE ]; then
                 	$FXOTUNE -s