- move lots of admin-only/system-only stuff to sbin and lib, yet keep compat

[packages/cyrus-imapd.git] / cyrus-imapd.init

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index e266ebf6a7bd806b41f3144841243c712f38b803..961025ab01cf9f0f44b97b0809b3851c58fd911e 100644 (file)
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -26,40 +26,43 @@ fi
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
-               msg_starting "Cyrus IMAP Daemon"
-               /usr/lib/cyrus/cyrus-master &
-               if ps -C cyrus-master >/dev/null 2>&1; then
-                       RETVAL=$?
-                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-imapd
-                       ok
-               else
-                       fail
-               fi
-       else
+       if [ -f /var/lock/subsys/cyrus-imapd ]; then
                msg_already_running "Cyrus IMAPD"
+               return
+       fi
+
+       msg_starting "Cyrus IMAP Daemon"
+       /usr/sbin/cyrmaster &
+       if ps -C cyrmaster >/dev/null 2>&1; then
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-imapd
+               ok
+       else
+               fail
        fi
 }
 
 stop() {
        # Stop daemons.
-       if [ -f /var/lock/subsys/cyrus-imapd ]; then
-               msg_stopping "Cyrus IMAP Daemon"
-               killproc cyrus-master
-               rm -f /var/lock/subsys/cyrus-imapd
-       else
+       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
                msg_not_running "Cyrus IMAP Daemon"
+               return
        fi
+
+       msg_stopping "Cyrus IMAP Daemon"
+       killproc cyrmaster
+       rm -f /var/lock/subsys/cyrus-imapd
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/cyrus-imapd ]; then
-               stop
-               start
-       else
+       if [ ! -f /var/lock/subsys/cyrus-imapd ]; then
                msg_not_running "Cyrus IMAP Daemon"
                RETVAL=$1
+               return
        fi
+
+       stop
+       start
 }
 
 RETVAL=0
@@ -82,7 +85,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-       status cyrus-master
+       status cyrmaster
        RETVAL=$?
        ;;
   *)