Author: glen Date: Wed Jan 6 08:27:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- unify, simplify
---- Files affected:
packages/spamassassin:
spamassassin-spamd.init (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/spamassassin/spamassassin-spamd.init
diff -u packages/spamassassin/spamassassin-spamd.init:1.5
packages/spamassassin/spamassassin-spamd.init:1.6
--- packages/spamassassin/spamassassin-spamd.init:1.5 Mon Jun 18 09:38:58 2007
+++ packages/spamassassin/spamassassin-spamd.init Wed Jan 6 09:27:07 2010
@@ -24,32 +24,34 @@
# Check that networking is up.
if is_no "${NETWORKING}"; then
- msg_network_down SpamAssassin
+ msg_network_down "SpamAssassin"
exit 1
fi
start() {
# Start daemon.
- if [ ! -f /var/lock/subsys/spamd ]; then
- msg_starting SpamAssassin
- daemon spamd $SPAMD_OPTS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
- else
- msg_already_running SpamAssassin
+ if [ -f /var/lock/subsys/spamd ]; then
+ msg_already_running "SpamAssassin"
+ return
fi
+
+ msg_starting "SpamAssassin"
+ daemon /usr/sbin/spamd $SPAMD_OPTS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
}
stop() {
# Stop daemons.
- if [ -f /var/lock/subsys/spamd ]; then
- msg_stopping SpamAssassin
- killproc spamd
- RETVAL=$?
- rm -f /var/lock/subsys/spamd
- else
- msg_not_running SpamAssassin
+ if [ ! -f /var/lock/subsys/spamd ]; then
+ msg_not_running "SpamAssassin"
+ return
fi
+
+ msg_stopping "SpamAssassin"
+ killproc spamd
+ RETVAL=$?
+ rm -f /var/lock/subsys/spamd
}
# See how we were called.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spamassassin/spamassassin-spamd.init?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
