diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-08-23 15:37:21 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-08-23 15:37:21 +0100 |
| commit | 2d3b0045a6146424077294b40f0c720d73af9869 (patch) | |
| tree | 4622f0ecd1b001fe02019d792873e81212d01ff5 | |
| parent | 61a8b609310264d35eaff5224c07821f53c2ea9c (diff) | |
| download | pykolab-2d3b0045a6146424077294b40f0c720d73af9869.tar.gz | |
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
| -rw-r--r-- | kolabd/kolabd.sysvinit | 12 | ||||
| -rw-r--r-- | saslauthd/kolab-saslauthd.sysvinit | 12 | ||||
| -rw-r--r-- | wallace/wallace.sysvinit | 12 |
3 files changed, 27 insertions, 9 deletions
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 diff --git a/saslauthd/kolab-saslauthd.sysvinit b/saslauthd/kolab-saslauthd.sysvinit index cc1715e..033bbc7 100644 --- a/saslauthd/kolab-saslauthd.sysvinit +++ b/saslauthd/kolab-saslauthd.sysvinit @@ -11,15 +11,17 @@ # Provides: kolab-saslauthd # 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 SASL authentication daemon # Description: The Kolab saslauthd is a server process which handles \ # authentication requests on behalf of the cyrus-sasl library. ### 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. SOCKETDIR=/var/run/saslauthd @@ -29,6 +31,10 @@ if [ -f /etc/sysconfig/kolab-saslauthd ] ; then . /etc/sysconfig/kolab-saslauthd fi +if [ -f /etc/default/kolab-saslauthd ]; then + . /etc/default/kolab-saslauthd +fi + RETVAL=0 # Set up some common variables before we launch into what might be diff --git a/wallace/wallace.sysvinit b/wallace/wallace.sysvinit index efdbe2d..4848827 100644 --- a/wallace/wallace.sysvinit +++ b/wallace/wallace.sysvinit @@ -10,14 +10,16 @@ # Provides: wallaced # 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 Wallace server daemon is a content filtering daemon. ### 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" @@ -28,6 +30,10 @@ if [ -f /etc/sysconfig/wallace ] ; then . /etc/sysconfig/wallace fi +if [ -f /etc/default/wallace ]; then + . /etc/default/wallace +fi + RETVAL=0 # Set up some common variables before we launch into what might be |