[zaptel-commits] tzafrir: branch tzafrir/zaphelper r1630 - /team/tzafrir/zaphelper/zaptel.init

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Tue Nov 21 14:48:34 2006
New Revision: 1630

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1630
Log:
A few more minor fixes to init script.

Modified:
    team/tzafrir/zaphelper/zaptel.init

Modified: team/tzafrir/zaphelper/zaptel.init
URL: http://svn.digium.com/view/zaptel/team/tzafrir/zaphelper/zaptel.init?view=diff&rev=1630&r1=1629&r2=1630
==============================================================================
--- team/tzafrir/zaphelper/zaptel.init (original)
+++ team/tzafrir/zaphelper/zaptel.init Tue Nov 21 14:48:34 2006
@@ -25,11 +25,12 @@
 
 # Source zaptel configuration.
 if [ $system = debian ]; then
-	[ -f /etc/default/zaptel ] && . /etc/default/zaptel
-		LOCKFILE=/var/lock/zaptel
+	set -e
+	if [ -f /etc/default/zaptel ]; then . /etc/default/zaptel; fi
+	LOCKFILE=/var/lock/zaptel # FIXME: not used with Debian.
 elif [ $system = redhat ]; then
 	[ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel
-		LOCKFILE=/var/lock/subsys/zaptel
+	LOCKFILE=/var/lock/subsys/zaptel
 fi
 
 if [ -z "${MODULES}" ]; then