Merge branch 'vb/df'

diff --git a/contrib/redhat/init.d-collectd b/contrib/redhat/init.d-collectd
index ec55a52a55d75e68613e06b35e989601d0d25bd5..abdb168f15d28cce78db59ca29589d2ef0a40e5d 100644 (file)
--- a/contrib/redhat/init.d-collectd
+++ b/contrib/redhat/init.d-collectd
@@ -18,12 +18,18 @@ prog="collectdmon"
 service="collectd"
 CONFIG=/etc/collectd.conf
 COLLECTD=/usr/sbin/collectd
-COLLECTDMONPID=/var/run/collectdmon.pid
+COLLECTDMONPIDDIR="/var/run"
+COLLECTDMONPID="$COLLECTDMONPIDDIR/collectdmon.pid"
 
 if [ -r /etc/sysconfig/$service ]; then
        . /etc/sysconfig/$service
 fi
 
+if [[ ! -d $COLLECTDMONPIDDIR ]]; then
+       mkdir -p $COLLECTDMONPIDDIR
+       [ -n "${RUNAS}" ] && chown "${RUNAS}:" "$COLLECTDMONPIDDIR"
+fi
+
 check_config() {
         if test ! -r "$CONFIG"; then
                 return 2
@@ -44,7 +50,7 @@ start () {
                echo $"not starting due to configuration error"
                failure $"not starting $service due to configuration error"
        else
-               daemon $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
+               daemon --user "${RUNAS:-root}" $prog -P $COLLECTDMONPID -c $COLLECTD -- -C "$CONFIG" $ARGS
                RETVAL=$?
                echo
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$service
@@ -52,7 +58,7 @@ start () {
 }
 stop () {
        echo -n $"Stopping collectd: "
-       killproc $prog
+       killproc -p $COLLECTDMONPID $prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$service
@@ -66,7 +72,7 @@ case "$1" in
        stop
        ;;
   status)
-       status $prog
+       status -p $COLLECTDMONPID $prog
        ;;
   restart|reload)
        check_config
@@ -81,7 +87,7 @@ case "$1" in
        fi
        ;;
   condrestart)
-       [ -f /var/lock/subsys/$prog ] && restart || :
+       [ -f /var/lock/subsys/$service ] && restart || :
        ;;
   *)
        echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"