OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Dec-2004 18:59:17
Branch: HEAD Handle: 2004120717591600
Modified files:
openpkg-src/monit monit.patch monit.spec rc.monit
Log:
stop monit very early and write state file into OpenPKG instance and
not root's home directory
Summary:
Revision Changes Path
1.10 +30 -0 openpkg-src/monit/monit.patch
1.43 +1 -1 openpkg-src/monit/monit.spec
1.17 +1 -1 openpkg-src/monit/rc.monit
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 monit.patch
--- openpkg-src/monit/monit.patch 11 Oct 2004 15:20:12 -0000 1.9
+++ openpkg-src/monit/monit.patch 7 Dec 2004 17:59:16 -0000 1.10
@@ -132,3 +132,33 @@
#include "monitor.h"
#include "process.h"
#include "process_sysdep.h"
+Index: monitor.h
+--- monitor.h.orig 2004-09-10 21:13:58 +0200
++++ monitor.h 2004-12-07 18:54:11 +0100
+@@ -71,6 +71,7 @@
+ #define MYPIDMASK 0122
+ #define MYPIDDIR PIDDIR
+ #define MYPIDFILE "monit.pid"
++#define MYSTATEDIR PIDDIR
+ #define MYSTATEFILE "monit.state"
+
+ #define LOCALHOST "localhost"
+Index: files.c
+--- files.c.orig 2004-12-07 18:51:17 +0100
++++ files.c 2004-12-07 18:55:04 +0100
+@@ -102,7 +102,15 @@
+ /* Set the location of the programs state file */
+ if(Run.statefile == NULL) {
+
++ if(! getuid()) {
++
++ snprintf(statefile, STRLEN, "%s/%s", MYSTATEDIR, MYSTATEFILE);
++
++ } else {
++
+ snprintf(statefile, STRLEN, "%s/.%s", Run.Env.home, MYSTATEFILE);
++
++ }
+
+ Run.statefile= xstrdup(statefile);
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 monit.spec
--- openpkg-src/monit/monit.spec 11 Oct 2004 15:20:12 -0000 1.42
+++ openpkg-src/monit/monit.spec 7 Dec 2004 17:59:16 -0000 1.43
@@ -34,7 +34,7 @@
Group: System
License: GPL
Version: 4.4
-Release: 20041011
+Release: 20041207
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/rc.monit
============================================================================
$ cvs diff -u -r1.16 -r1.17 rc.monit
--- openpkg-src/monit/rc.monit 21 Aug 2004 18:04:54 -0000 1.16
+++ openpkg-src/monit/rc.monit 7 Dec 2004 17:59:16 -0000 1.17
@@ -32,7 +32,7 @@
rcService monit enable yes || exit 0
@l_prefix@/bin/monit >/dev/null
-%stop -p 900 -u @l_susr@
+%stop -p 100 -u @l_susr@
rcService monit enable yes || exit 0
@l_prefix@/bin/monit quit
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
