use common pidfile for status and stop

diff --git a/nagios-nrpe.spec b/nagios-nrpe.spec
index 38434efc9c1115a3edca83b64916ec6f24186cf9..689d5015a4283fd80521aacad42e1dcc5bffd7ce 100644 (file)
--- a/nagios-nrpe.spec
+++ b/nagios-nrpe.spec
@@ -2,7 +2,7 @@ Summary:        Nagios remote plugin execution service/plugin
 Summary(pl.UTF-8):     Demon i wtyczka zdalnego wywoływania wtyczek Nagios
 Name:          nagios-nrpe
 Version:       2.15
-Release:       6
+Release:       7
 License:       GPL v2
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/nagios/nrpe-%{version}.tar.gz
@@ -20,7 +20,7 @@ BuildRequires:        openssl-tools
 BuildRequires: rpmbuild(macros) >= 1.647
 Requires(post,preun):  /sbin/chkconfig
 Requires:      nagios-common
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.1.26
 Provides:      nagios-core
 Obsoletes:     netsaint-nrpe
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

diff --git a/nrpe.init b/nrpe.init
index 3161c7334e4dcaae031ce86f538d90f4f855a161..4cba6ef4d13023cbd4d8203dc6a9b0172832d53a 100755 (executable)
--- a/nrpe.init
+++ b/nrpe.init
@@ -27,6 +27,8 @@ else
        exit 0
 fi
 
+pidfile=/var/run/nrpe/nrpe.pid
+
 start() {
        if [ -f /var/lock/subsys/nrpe ]; then
                msg_already_running "Nagios NRPE daemon"
@@ -46,7 +48,7 @@ stop() {
        fi
 
        msg_stopping "Nagios NRPE daemon"
-       killproc --pidfile nrpe/nrpe.pid nrpe
+       killproc --pidfile $pidfile nrpe
        rm -f /var/lock/subsys/nrpe
 }
 
@@ -80,7 +82,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-       status nrpe
+       status --pidfile $pidfile nrpe
        exit $?
        ;;
   *)