[monit/el6] Fix init script to use the pidfile

Maxim Burgerhout wzzrd at fedoraproject.org
Wed Jul 11 21:51:25 UTC 2012


commit 6b1b020cde6a26ac8a8b8226953fd5d207bf0bf5
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Wed Jul 11 23:50:52 2012 +0200

    Fix init script to use the pidfile
    
    instead of the process name to kill the daemon

 monit-sysv-initscript |    4 ++--
 monit.spec            |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/monit-sysv-initscript b/monit-sysv-initscript
index 85f1651..ec0f222 100644
--- a/monit-sysv-initscript
+++ b/monit-sysv-initscript
@@ -9,7 +9,7 @@
 #
 # processname: monit
 # config: /etc/monit.conf
-# pidfile: /var/run/monit
+# pidfile: /var/run/monit.pid
 # Short-Description: Monit is a system monitor
 
 # Source function library.
@@ -36,7 +36,7 @@ start() {
 
 stop() {
 	echo -n $"Shutting down $prog: "
-	killproc $prog
+	killproc -p ${pidfile}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
diff --git a/monit.spec b/monit.spec
index eaaed7d..e42b99a 100644
--- a/monit.spec
+++ b/monit.spec
@@ -1,6 +1,6 @@
 Name:           monit
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -95,6 +95,10 @@ fi
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Wed Jul 11 2012 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.1.1-3
+- Fix init script to use the pidfile instead of the process name to kill the
+  daemon
+
 * Thu Aug 05 2010 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.1.1-2
 - Enabled PAM authentication (bz #621599)
 


More information about the scm-commits mailing list