Bug#495236: fixed pid name (nagios3.pid) and more

[Alessandro De Zorzi]

A init.d/nagios3 script file suppose pid file is
/var/run/nagios3/nagios.pid

but seems is:
but it is /var/run/nagios3/nagios3.pid

I rewrite functions using start-stop-daemon command,
and now seems to works on my system Lenny.

Script provide by 3.0.3-2 produce these warnings:

# /etc/init.d/nagios3 start
Starting nagios3 monitoring daemon: nagios3/etc/init.d/nagios3: line 64:
kill: (5963) - No such process
.
# /etc/init.d/nagios3 restart
Restarting nagios3 monitoring daemon: nagios3
/etc/init.d/nagios3: line 64: kill: (6112) - No such process

Alessandro

--- nagios3.org	2008-09-04 13:41:36.000000000 +0200
+++ nagios3	2008-09-04 17:43:58.000000000 +0200
@@ -61,7 +61,7 @@
 		
   if [ -f "$THEPIDFILE" ]; then
     pid="$(cat $THEPIDFILE)"
-    if [ "$pid" ] && kill -0 $pid >/dev/null; then
+    if [ "$pid" ] && kill -0 $pid &>/dev/null; then
       return 0    # Is started
     fi
   fi
@@ -115,7 +115,9 @@
 fi
 
 THEPIDFILE=$(get_config "lock_file")
-[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios3/nagios.pid'
+[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios3/nagios3.pid'
+
+echo "Pid file "$THEPIDFILE
 
 start () {
   DIRECTORY=$(dirname $THEPIDFILE)
@@ -128,7 +130,7 @@
       rm -f $nagiospipe
     fi
     if check_config; then
-      start_daemon -n $NICENESS -p $THEPIDFILE $DAEMON -d $NAGIOSCFG
+      start-stop-daemon --start -b --quiet -m -p $THEPIDFILE --exec $DAEMON -- $NAGIOSCFG
       ret=$?
     else
       log_failure_msg "errors in config!"
@@ -144,7 +146,7 @@
 }
 
 stop () {
-    killproc -p $THEPIDFILE
+    start-stop-daemon --stop --quiet -p $THEPIDFILE
     ret=$?
     if [ `pidof nagios3 | wc -l ` -gt 0 ]; then
         echo -n "Waiting for $NAME daemon to die.."

signature.asc
Description: OpenPGP digital signature