diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-24 22:13:22 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-08-24 22:13:22 +0000 |
| commit | bdd4910d67bde5aa5f4ac9056a923538c2bf6109 (patch) | |
| tree | cda743c8d64082acdcb243cd8f9760b5ccbe7c6f /net-analyzer/munin/files | |
| parent | Fix build with gcc-4.7, thanks dev-zero (diff) | |
| download | gentoo-2-bdd4910d67bde5aa5f4ac9056a923538c2bf6109.tar.gz gentoo-2-bdd4910d67bde5aa5f4ac9056a923538c2bf6109.tar.bz2 gentoo-2-bdd4910d67bde5aa5f4ac9056a923538c2bf6109.zip | |
Restore checkpath for the pidfile, but don't set owner on it (it doesn't need to have one, here); always change owners in the localstart script instead. Change the default pid_file for the node to /var/run/munin-node.pid as the node does not use anything else in that directory.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/munin/files')
| -rw-r--r-- | net-analyzer/munin/files/localstart-munin | 2 | ||||
| -rw-r--r-- | net-analyzer/munin/files/munin-node_init.d_2.0.5 | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net-analyzer/munin/files/localstart-munin b/net-analyzer/munin/files/localstart-munin index b32d76092038..2934cba72c18 100644 --- a/net-analyzer/munin/files/localstart-munin +++ b/net-analyzer/munin/files/localstart-munin @@ -1,7 +1,5 @@ #!/bin/sh -[ -d /var/run/munin ] && exit 0 - mkdir -p /var/run/munin chown munin:munin /var/run/munin chmod 0700 /var/run/munin diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.5 b/net-analyzer/munin/files/munin-node_init.d_2.0.5 index a3ad32f0dd3a..657ae6640a3a 100644 --- a/net-analyzer/munin/files/munin-node_init.d_2.0.5 +++ b/net-analyzer/munin/files/munin-node_init.d_2.0.5 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.1 2012/08/23 19:20:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-node_init.d_2.0.5,v 1.2 2012/08/24 22:13:22 flameeyes Exp $ get_munin_config() { awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE" @@ -24,4 +24,8 @@ depend() { use logger } +start_pre() { + checkpath -d $(dirname ${pidfile}) +} + # vim: filetype=gentoo-init-d: |