diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2014-12-14 23:33:24 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2014-12-14 23:33:24 +0000 |
| commit | b843a5cd62a4fe907adb4103949def3ce8776bc3 (patch) | |
| tree | 38eadea834a18d55391a2f4bdaaa2b759d6c77a2 /net-analyzer/icinga2 | |
| parent | fixing init script, thanks Feandil :D bug 532582 (diff) | |
| download | gentoo-2-b843a5cd62a4fe907adb4103949def3ce8776bc3.tar.gz gentoo-2-b843a5cd62a4fe907adb4103949def3ce8776bc3.tar.bz2 gentoo-2-b843a5cd62a4fe907adb4103949def3ce8776bc3.zip | |
final fix for the init I hope
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-analyzer/icinga2')
| -rw-r--r-- | net-analyzer/icinga2/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/icinga2/files/icinga2.initd | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog index b9f532bfc6e1..76e5622d7c63 100644 --- a/net-analyzer/icinga2/ChangeLog +++ b/net-analyzer/icinga2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/icinga2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.18 2014/12/14 23:27:21 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.19 2014/12/14 23:33:24 prometheanfire Exp $ + + 14 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> files/icinga2.initd: + final fix for the init I hope *icinga2-2.2.1-r2 (14 Dec 2014) diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd index 4640eab155f6..7945b46617e6 100644 --- a/net-analyzer/icinga2/files/icinga2.initd +++ b/net-analyzer/icinga2/files/icinga2.initd @@ -20,8 +20,16 @@ checkconfig() { eend 1 fi - ICINGA2_USER=`$DAEMON variable get --current RunAsUser` - ICINGA2_GROUP=`$DAEMON variable get --current RunAsGroup` + ICINGA2_USER=$($DAEMON variable get --current RunAsUser) + if [ $? != 0 ]; then + eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'." + return 1 + fi + ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup) + if [ $? != 0 ]; then + eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'." + return 1 + fi checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR |