- add try-restart

Changed files:
    cyrus-imapd.init -> 1.11
    cyrus-sync.init -> 1.3

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index fd4eeb426676950810ffc257199e37c323129934..30f9824ba1de41767f4ddf2174ddc0327290acec 100644 (file)
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -50,6 +50,16 @@ stop() {
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/cyrus-imapd ]; then
+               stop
+               start
+       else
+               msg_not_running cyrus-imapd
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -59,16 +69,22 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|force-reload)
+  restart)
        stop
        start
+  try-restart)
+       condrestart 0
+       ;;
+       ;;
+  force-reload)
+       condrestart 7
        ;;
   status)
        status cyrus-master
        RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac
 

diff --git a/cyrus-sync.init b/cyrus-sync.init
index 7149d06acc77b567c0b86c0036305ec8dc5f02ab..4cd90c4c434b1f23c201f6975fcc7b821582ca23 100644 (file)
--- a/cyrus-sync.init
+++ b/cyrus-sync.init
@@ -57,6 +57,16 @@ stop() {
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/cyrus-sync ]; then
+               stop
+               start
+       else
+               msg_not_running cyrus-sync
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -66,16 +76,22 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|force-reload)
+  restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status cyrus-sync
        RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac