aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/munin-node/files
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2004-12-14 09:43:10 +0800
committersem <sem@FreeBSD.org>2004-12-14 09:43:10 +0800
commitd5d96cbd846ba477dec307d749e2cf7f19a07848 (patch)
tree1ed77064781fe6709fb0e5abd981285786ebbef5 /sysutils/munin-node/files
parentfc014de61e3a87035ce34748e4374659c4a7c2b9 (diff)
downloadfreebsd-ports-graphics-d5d96cbd846ba477dec307d749e2cf7f19a07848.tar.gz
freebsd-ports-graphics-d5d96cbd846ba477dec307d749e2cf7f19a07848.tar.zst
freebsd-ports-graphics-d5d96cbd846ba477dec307d749e2cf7f19a07848.zip
- Update to 1.0.4
* it unbreaks munin-node PR: ports/74165, ports/74166 Submitted by: maintainer
Diffstat (limited to 'sysutils/munin-node/files')
-rw-r--r--sysutils/munin-node/files/munin-node.sh8
-rw-r--r--sysutils/munin-node/files/pkg-message14
2 files changed, 18 insertions, 4 deletions
diff --git a/sysutils/munin-node/files/munin-node.sh b/sysutils/munin-node/files/munin-node.sh
index a0b47d4e1f5..fb88e12f06a 100644
--- a/sysutils/munin-node/files/munin-node.sh
+++ b/sysutils/munin-node/files/munin-node.sh
@@ -14,7 +14,13 @@ case "$1" in
if [ -f $CONFIG ]; then
PIDFILE=`awk '$1 == "pid_file" { print $2 }' $CONFIG`
if [ -f $PIDFILE ]; then
- /bin/kill `cat $PIDFILE` && echo -n ' munin-node'
+ PID=`cat $PIDFILE`
+ CMD=`ps -xa -o command -p $PID | sed 1d`
+ case "$CMD" in
+ *munin-node*)
+ /bin/kill $PID && echo -n ' munin-node'
+ ;;
+ esac
fi
fi
;;
diff --git a/sysutils/munin-node/files/pkg-message b/sysutils/munin-node/files/pkg-message
index 206a4405759..96d07954fde 100644
--- a/sysutils/munin-node/files/pkg-message
+++ b/sysutils/munin-node/files/pkg-message
@@ -5,8 +5,16 @@ has been placed in %%PREFIX%%/etc/munin/munin-node.conf.
Please edit it according to your needs.
-The Munin client will be started at system boot automatically.
-You can start it manually with:
- %%PREFIX%%/etc/rc.d/munin-node.sh start
+********************************************************************
+
+The Munin client will *not* be started automatically. To allow it
+to start, put this line in /etc/rc.conf:
+
+munin_node_enable="YES"
+
+Then, it will be started on the next boot. To start it now, use
+this command:
+
+ /etc/rc.d/munin_node start
********************************************************************