From 2d3b0045a6146424077294b40f0c720d73af9869 Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Thu, 23 Aug 2012 15:37:21 +0100
Subject: Clause the inclusion of /etc/init.d/functions (it should exist)
 Include /etc/default/$service if the file exists

Both changes work towards resolving #972
---
 kolabd/kolabd.sysvinit | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'kolabd')

diff --git a/kolabd/kolabd.sysvinit b/kolabd/kolabd.sysvinit
index 9f452ff..302dfa9 100644
--- a/kolabd/kolabd.sysvinit
+++ b/kolabd/kolabd.sysvinit
@@ -12,8 +12,8 @@
 # Provides: kolabd
 # Default-Start: -
 # Default-Stop: 0 1 2 6
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs $network
+# Required-Start: $remote_fs $local_fs $network
+# Required-Stop: $remote_fs $local_fs $network
 # Short-Description: Start/Stop the Kolab Server daemon
 # Description:      The Kolab server is a server process which synchronizes
 #                   LDAP, SQL and other authentication databases with Cyrus IMAP,
@@ -21,7 +21,9 @@
 ### END INIT INFO
 
 # Source function library.
-. /etc/init.d/functions
+if [ -f /etc/init.d/functions ]; then
+    . /etc/init.d/functions
+fi
 
 # Source our configuration file for these variables.
 FLAGS="--fork -l warning"
@@ -30,6 +32,10 @@ if [ -f /etc/sysconfig/kolabd ] ; then
     . /etc/sysconfig/kolabd
 fi
 
+if [ -f /etc/default/kolabd ]; then
+    . /etc/default/kolabd
+fi
+
 RETVAL=0
 
 # Set up some common variables before we launch into what might be
-- 
cgit v1.1