X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dovecot.init;h=6a76990e9c823c30a602764d16f0bbf78c8892ae;hb=cccb69895755dc1cbab724ba793ca61196e0d9ae;hp=a05390d280f798b45ccf6a575825aa2fb0196f2a;hpb=b9e08f0fd0fbc19f1977b938250ef68a8e9757cc;p=packages%2Fdovecot.git

diff --git a/dovecot.init b/dovecot.init
index a05390d..6a76990 100644
--- a/dovecot.init
+++ b/dovecot.init
@@ -23,10 +23,7 @@ else
 	exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/dovecot ]; then
 		msg_starting "Dovecot"
@@ -36,32 +33,64 @@ case "$1" in
 	else
 		msg_already_running "Dovecot"
 	fi
-	;;
-  stop)
-  	if [ -f /var/lock/subsys/dovecot ]; then
+}
+
+stop() {
+	if [ -f /var/lock/subsys/dovecot ]; then
 		msg_stopping "Dovecot"
-		killproc dovecot
+		killproc --pidfile dovecot/master.pid dovecot
 		rm -f /var/lock/subsys/dovecot
 	else
 		msg_not_running "Dovecot"
 	fi
+}
+
+reload() {
+	if [ -f /var/lock/subsys/dovecot ]; then
+		msg_reloading dovecot
+		killproc --pidfile dovecot/master.pid docevot -HUP
+		RETVAL=$?
+	else
+		msg_not_running "Dovecot"
+		RETVAL=7
+	fi
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/dovecot ]; then
+		stop
+		start
+	else
+		msg_not_running "Dovecot"
+		RETVAL=$1
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
 	;;
-  reload)
-  	msg_reloading "Dovecot"
-  	killproc dovecot -HUP
-	exit $?
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  reload|force-reload)
+  	reload
 	;;
   status)
   	status dovecot
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|reload|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
 	exit 3
 esac