[Oval-commits] r235 - trunk/oval-agent/debian
Javier Fernandez-Sanguino Pen~a
jfs at alioth.debian.org
Tue Sep 4 19:47:43 UTC 2007
Author: jfs
Date: 2007-09-04 19:47:43 +0000 (Tue, 04 Sep 2007)
New Revision: 235
Modified:
trunk/oval-agent/debian/oval-agent.init
Log:
Fix user and config file
Modified: trunk/oval-agent/debian/oval-agent.init
===================================================================
--- trunk/oval-agent/debian/oval-agent.init 2007-09-04 19:46:25 UTC (rev 234)
+++ trunk/oval-agent/debian/oval-agent.init 2007-09-04 19:47:43 UTC (rev 235)
@@ -22,8 +22,8 @@
PIDFILE=/var/run/oval-agent.pid
OVALAGENT_ENABLE=false
-#OVALAGENT_USER=oval
-OVALAGENT_CONFIG_FILE=/etc/oval/oval-agent.conf
+OVALAGENT_USER=oval
+OVALAGENT_CONFIG_FILE=/etc/oval/agent.conf
OVALAGENT_LOG_DIR=/var/log/oval
test -x $DAEMON || exit 0
@@ -58,7 +58,7 @@
exit 1
fi
start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
--exec $DAEMON \
-- -c "$OVALAGENT_CONFIG_FILE"
log_end_msg $?
@@ -71,7 +71,7 @@
stop)
log_daemon_msg "Stopping $NAME daemon" "$NAME"
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --retry INT/15/TERM/5/KILL/5
+ --signal INT
log_end_msg $?
rm -f $PIDFILE
;;
@@ -87,13 +87,13 @@
log_daemon_msg "Restarting $NAME daemon" "$NAME"
if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --retry INT/15/TERM/5/KILL/5 || true
+ --signal INT || true
sleep 1
else
rm -f $PIDFILE
fi
if start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
--exec $DAEMON \
-- -c "$OVALAGENT_CONFIG_FILE"
then
More information about the Oval-commits
mailing list