Author: glen Date: Sat Nov 27 15:07:25 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- formatting
---- Files affected:
packages/cyrus-imapd:
cyrus-imapd.init (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/cyrus-imapd/cyrus-imapd.init
diff -u packages/cyrus-imapd/cyrus-imapd.init:1.13
packages/cyrus-imapd/cyrus-imapd.init:1.14
--- packages/cyrus-imapd/cyrus-imapd.init:1.13 Wed May 7 10:58:26 2008
+++ packages/cyrus-imapd/cyrus-imapd.init Sat Nov 27 16:07:20 2010
@@ -26,40 +26,43 @@
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/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
}
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 cyrus-master
+ 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd.init?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
