Author: glen Date: Mon Oct 13 12:37:46 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- no daemon for flush-logs either
- full path to binary
---- Files affected:
SOURCES:
apache.init (1.59 -> 1.60)
---- Diffs:
================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.59 SOURCES/apache.init:1.60
--- SOURCES/apache.init:1.59 Mon Oct 13 00:46:38 2008
+++ SOURCES/apache.init Mon Oct 13 14:37:40 2008
@@ -43,7 +43,7 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/httpd ]; then
msg_starting httpd.${HTTPD_MPM}
- daemon httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
+ daemon /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
else
@@ -95,12 +95,12 @@
;;
reload|force-reload|graceful)
if [ -f /var/lock/subsys/httpd ]; then
- run_cmd "Checking httpd.${HTTPD_MPM} configuration"
httpd.${HTTPD_MPM} $CFG -t
+ run_cmd "Checking httpd.${HTTPD_MPM} configuration"
/usr/sbin/httpd.${HTTPD_MPM} $CFG -t
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
msg_reloading httpd.${HTTPD_MPM}
busy
- httpd.${HTTPD_MPM} $CFG -k graceful
+ /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
RETVAL=$?
[ $RETVAL -eq 0 ] && ok || fail
fi
@@ -113,11 +113,12 @@
if [ -f /var/lock/subsys/httpd ]; then
msg_reloading httpd.${HTTPD_MPM}
- httpd.${HTTPD_MPM} -t >/dev/null 2>&1
+ /usr/sbin/httpd.${HTTPD_MPM} -t >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
- daemon httpd.${HTTPD_MPM} $CFG -k graceful
+ /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
RETVAL=$?
+ [ $RETVAL -eq 0 ] && ok || fail
else
fail
echo >&2 "Configuration file syntax test failed."
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache.init?r1=1.59&r2=1.60&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
