Author: gotar Date: Mon Feb 16 00:55:03 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- provide full path to --pidfile as start-stop-daemon doesn't handle
/var/run relative ones and functions don't support expanding
---- Files affected:
SOURCES:
apache.init (1.63 -> 1.64) , mksd.init (1.8 -> 1.9) , amavisd-new.init (1.15
-> 1.16) , clamav.init (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.63 SOURCES/apache.init:1.64
--- SOURCES/apache.init:1.63 Mon Dec 8 11:19:55 2008
+++ SOURCES/apache.init Mon Feb 16 01:54:56 2009
@@ -49,7 +49,7 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/httpd ]; then
msg_starting "$SVC_NAME"
- daemon /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
+ daemon --pidfile /var/run/httpd.pid
/usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
else
@@ -61,7 +61,7 @@
# Stop daemons.
if [ -f /var/lock/subsys/httpd ]; then
msg_stopping "$SVC_NAME"
- killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
+ killproc --pidfile /var/run/httpd.pid httpd.${HTTPD_MPM}
rm -f /var/lock/subsys/httpd /var/run/httpd.pid
/var/run/httpd.loc* >/dev/null 2>&1
else
msg_not_running "$SVC_NAME"
@@ -82,10 +82,10 @@
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
status)
status httpd.${HTTPD_MPM}
================================================================
Index: SOURCES/mksd.init
diff -u SOURCES/mksd.init:1.8 SOURCES/mksd.init:1.9
--- SOURCES/mksd.init:1.8 Thu Dec 8 01:28:53 2005
+++ SOURCES/mksd.init Mon Feb 16 01:54:57 2009
@@ -22,7 +22,7 @@
if [ ! -f /var/lock/subsys/mksd ]; then
msg_starting mksd
[ -f /var/run/mksd/mksd.pid ] && rm -f /var/run/mksd/mksd.pid
- daemon --user mksd /usr/bin/mksd $MKSD_MODE $MKSD_PROCESS
+ daemon --pidfile /var/run/mksd/mksd.pid --user mksd
/usr/bin/mksd $MKSD_MODE $MKSD_PROCESS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mksd
else
@@ -32,8 +32,8 @@
stop)
if [ -f /var/lock/subsys/mksd ]; then
msg_stopping mksd
- killproc --pidfile mksd/mksd.pid mksd
- rm -f /var/run/mksd.pid /var/lock/subsys/mksd >/dev/null 2>&1
+ killproc --pidfile /var/run/mksd/mksd.pid mksd
+ rm -f /var/lock/subsys/mksd /var/run/mksd/mksd.pid >/dev/null
2>&1
else
msg_not_running mksd
fi
================================================================
Index: SOURCES/amavisd-new.init
diff -u SOURCES/amavisd-new.init:1.15 SOURCES/amavisd-new.init:1.16
--- SOURCES/amavisd-new.init:1.15 Fri Apr 13 13:51:12 2007
+++ SOURCES/amavisd-new.init Mon Feb 16 01:54:57 2009
@@ -21,7 +21,7 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/amavisd ]; then
msg_starting Amavisd
- LC_ALL= LANG= LC_TYPE= LC_CTYPE= daemon $SERVICE_RUN_NICE_LEVEL
/usr/sbin/amavisd -c /etc/amavisd.conf
+ LC_ALL= LANG= LC_TYPE= LC_CTYPE= daemon --pidfile
/var/run/amavisd/amavisd.pid $SERVICE_RUN_NICE_LEVEL /usr/sbin/amavisd -c
/etc/amavisd.conf
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/amavisd
else
@@ -33,8 +33,8 @@
# Stop daemons.
if [ -f /var/lock/subsys/amavisd ]; then
msg_stopping Amavisd
- killproc --pidfile amavisd/amavisd.pid amavisd
- rm -f /var/lock/subsys/amavisd >/dev/null 2>&1
+ killproc --pidfile /var/run/amavisd/amavisd.pid amavisd
+ rm -f /var/lock/subsys/amavisd /var/run/amavisd/amavisd.pid
>/dev/null 2>&1
else
msg_not_running Amavisd
fi
@@ -44,10 +44,10 @@
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
status)
status amavisd
================================================================
Index: SOURCES/clamav.init
diff -u SOURCES/clamav.init:1.16 SOURCES/clamav.init:1.17
--- SOURCES/clamav.init:1.16 Wed Nov 12 10:22:43 2008
+++ SOURCES/clamav.init Mon Feb 16 01:54:58 2009
@@ -7,7 +7,7 @@
# description: Clam Antivirus daemon
#
# processname: clamd
-# pidfile: /var/run/clamav/clamd.pid
+# pidfile: /var/run/clamav/clamd.pid
#
# $Id$
@@ -21,7 +21,7 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/clamd ]; then
msg_starting "Clam Antivirus daemon"
- daemon /usr/sbin/clamd
+ daemon --pidfile /var/run/clamav/clamd.pid /usr/sbin/clamd
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd
else
@@ -32,8 +32,8 @@
stop() {
if [ -f /var/lock/subsys/clamd ]; then
msg_stopping "Clam Antivirus daemon"
- killproc --pidfile clamav/clamd.pid clamd
- rm -f /var/run/clamav/clamd.pid /var/lock/subsys/clamd
>/dev/null 2>&1
+ killproc --pidfile /var/run/clamav/clamd.pid clamd
+ rm -f /var/lock/subsys/clamd /var/run/clamav/clamd.pid
>/dev/null 2>&1
else
msg_not_running "Clam Antivirus daemon"
fi
@@ -64,10 +64,10 @@
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
restart)
stop
@@ -77,7 +77,7 @@
condrestart 0
;;
reload|force-reload)
- reload
+ reload
;;
status)
status clamd
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache.init?r1=1.63&r2=1.64&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mksd.init?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/amavisd-new.init?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/clamav.init?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
