final fix for the init I hope

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index b9f532bfc6e13f7c0e075b4bd54351d14c09a5fd..76e5622d7c631a30d1c57beb83adecec55adb9ef 100644 (file)
--- 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/Manifest b/net-analyzer/icinga2/Manifest
index ccceb47d838dcb7da7a2c6e995d6c6c53b4e5220..e6c782e06a8fc51746322ddf1c6afb55a71e15ae 100644 (file)
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,29 +4,29 @@ Hash: SHA256
 AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
 AUX icinga2-2.2.1-create_var_cache.patch 415 SHA256 aa6c6667e81a0082f6759b7fc15ce9c2c39c18822931ec7732ddc329125fb703 SHA512 c80345d55985304d23abdf97a4c6fd80105b2e1d33f538c09dcf42b993ac26ef5a995cf3c602a5347906ce937a524b6f8a1e658ee81ff08be3859f4ecf0d26e5 WHIRLPOOL 5b0e1e8c2afcc534f9100896dae13eedc3df2964d153dc9d5932a4a6c4c7996ca8f937ce7e70c804a82185be9b8e8717ac9aadb569c0265c10bd170d4740e69e
 AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e78cc8b95ae568 SHA512 f194b7a7d202bc5b8a611722b21a5cf8cf91afda15dc1b1b007050b34fbd7462952268fcb6eddd94e05d474364e7873ae691ccf0049b79c89e48f780b03b0520 WHIRLPOOL baa19b2a4bb4361b1ad093ec019b199fb41a64825cb434a9e2e48ff5eb14e82bf3a09fa0167afa86140a774c6f8fa034f2049881f7b84874f5f24702cc09c97e
-AUX icinga2.initd 1934 SHA256 13310a765e5ac214f17d7d4b426fb44f8d6afa5c3485b8344f6452612e4cbd78 SHA512 736271d3e80e9f325ca354fc4e1f6f41be5526c0b1352dd81a62622186791d882191e13dbf735038c54c61cc98e34f357a11cc09473fcfc4662e16b2c54fc7c9 WHIRLPOOL 5dc1cd616708b271aace167640521a6f9828edf926b171caf90b41fe6f69c57f156b24c03cfb6a43285271cb9427cbc18aaa30ddac132dc40bc1fc53e15342b8
+AUX icinga2.initd 2176 SHA256 4dfe16ec3b1c13676ac4120617ada82ebe41c9f474b9ee39f83b1ec38228ece2 SHA512 0fc0d680da7e5c37286d4f252faecd0e2f21697186b6a32ef898c690b53eef7961e8cb5175c86955b1ffd664fd1ea2c27120f51118fd4b6d22b5663817a17c69 WHIRLPOOL 034ab09ae7ff52b34f844afec8f91a7b6a28e90690fa23fc536621ba743bf57b37d900759fca25c331e6a7fc5aa54b3f729c5f6ede7fbed712df7d71128c4a59
 DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
 DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
 EBUILD icinga2-2.0.2.ebuild 3308 SHA256 414fc9a46d8f4fc3d8431241209e009e3c2bdf427802e76e45459a7d7e7a92f1 SHA512 c4a1013f864c227a9ec2c342ba666106f4c9e2f7d02e787cbf494d36d556d512e42fd0d1a456a7a5d72d096af7ba703e3ed7ba8c072a644ebe923132ad3b27ed WHIRLPOOL c85eac0059e8e8bea6498712633546be3e39d34c6ee203624cb4e08d9b8d8d7a86f9c67176e2648be55764a9d9f757dec3114973605940b0a3c58f5c13f0546f
 EBUILD icinga2-2.1.0-r3.ebuild 4080 SHA256 22d72e85fcd3db0e8525f7c9c19074b6d0a061831b9e00e8beae67b16d0de457 SHA512 2fac2143445e980f2be841acbdc20dc3e8663ee83d5d9bc1e97a943484c8f919de359285f3a769354c55f16293c01f9b3a386f6f589c3de444b712dca29f2b97 WHIRLPOOL d12cdb58547a05513460bfc6c608b79694d20aef1b519cf4f0374e919daef8e0e597b16669b7a3ae4a580b94c1518c28ea7e68ccdcdffe216a22985748f6d90a
 EBUILD icinga2-2.2.1-r2.ebuild 4253 SHA256 239560f15f4535f6f8a3da245e1aa56b7e2e75839649000f0a0efdf8f7ec9b45 SHA512 2f2bfaf451a3f7e0e55e1e1f53ca86b9740214b3ea8d6655a7df18a9689c9f84c0caf15516927a05db0f90ced225dabf31fd6435cf3aef3ad9413e3e4ba5a732 WHIRLPOOL ca4e21939304b4cecd370e8bcdbaa8fd2e4cdad82e54efe1cd941052ecb4a65d6914afc89ecba3d7ab3ab154d32c73073106d015192761bc3aabf00f61e2dc2f
-MISC ChangeLog 3123 SHA256 a580f0f2c0ac986d102fd64dcc8d8d00822228a61843fb42a42c96d1554ea378 SHA512 69fcafd64d45614420c3770995ca6eb90cda24ca068a14f9ec6f90559f6f65723ce0e6777eafa303034c4bb9d658d824abb5b78d9b2eff1776a5807dcbd7a1ca WHIRLPOOL 713f233ce7f462b71581be2d83e8887553a410398e6f08e21e55cbb39ed6400f68018ad9de836f6a166d0bda89794b7776a429b90b564577e496af1cd18527c0
+MISC ChangeLog 3234 SHA256 e7614dbdd7f44e399dc0adc70667b53b86843602299f06e32994a55d8f7503e2 SHA512 2d9b0293697d816cce74bc8ca22bd12447a3d2505cffa0fb6c541070bcf692710bf14f033b15eae16e6fd10ac15c3858c6061327c6a9a67f6705902c0c406fe3 WHIRLPOOL caf4f68f35410ffac3e72d33a01583d132ee252ec4c279eff6dc3ce7afb79c6377c385b828d74fb52935efdc99dac7ac0894450b957b3eb88f7f7e7be1c3597f
 MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUjh0cAAoJECRx6z5ArFrDtMYP/2UBWdVyTy+Mtp6HHdwpg8xS
-zcRjZl4qlnbmjB5e2EBW67QGUGAGRvXU9G14lSvVCYVSOkWxzykWLTcQv0Hiz/qm
-IqOQogNLLK7p/4wPTdVjP2n+0fskOs08gwSCaN4jMIhgd8yJc4guOHwjdEf89rh0
-E5okkV0KqGEwgIuiSaVpJ+0GfYEDW/Te7F1jdbMzCREeZ3N6ZWCHh9yZGMBfvoil
-OzG3VAPKUvZofyblKlytkEL5j/T7CJHWXZpzxVIlVYvQZBX8naeQhQb6jaXeAx57
-jty/D18gQYRPu3T0KFL2/AUfGnaTDoA4ZaWUe8gK4VoTTNacibzeIoQ5R3ssuNHl
-Eop4YEgOH5On9l56V2EY2Tx6nVeG/thgfGH43ykySAnSfcrhfJZJ+RxKjzW3AKN0
-18cS6Xuh2bkCVqrwOsFG9XxyGtfZdBtMXmdY3EHLdBS0HzQ6QiYu9slarwkETXf0
-TVf5FCFPnWNAlGzGtSU+r4cW2CwEtVm9JzyuPpL7cwbe25G0dpn6hhZbPxoRjDlX
-tsDOm7PXzcGDgnvlaaMJa4P6o61wGknRDxjcH+e8m4G53KABacGwTOs3pdNsi+zR
-66J3c/bBIN1H7LClvior8ED4jhiAtUinsGJ7225bfD/hItqk/ig7FpZVYjqZoNgL
-yNcGcuhrgGtoFlZPYkfe
-=W0Sp
+iQIcBAEBCAAGBQJUjh6IAAoJECRx6z5ArFrDFN0QAMU/LTc5X8G0fKrC86b1HBDi
+ULwZn8tXrG0jKY4sjRgl7GR1068zji1QxTTKyFRmVkvaEA4SVlrztFCYFKbGr8vN
+2w16IrNtVUvyx3+1J2r7YCnGJT6Cieg4idYFRurqzmWT3RkL8Kt78qFo8HwOWGeg
++koWo1jFtY/Zt1zFgiTfF1QQGOTjfQkoBGaO1iXHBAyRMqE7VY+pjM77bfElP7vI
+07Wy0Fh1vFjpX0RXyCIf/g3ByD4Ufh0+m0e1hUKFdzKGHUVUo1wnvy8Av3lhICNV
+o71xPi5eVWIOdiN/PK5pKRYGjHwKUzn5f4A982KwBJzBnKHsRd5rpe89Pc9/HWez
+rYV4ZTOLzr0GdC1MLXbLYhfmH4ysuQc8MXP3Ld7hBw4CKNPIMYb/fY2wTx5Hg3d1
+FqnWsXdk7JVJk3uYYzpEdgaoan+o+YDb9elayEnBSA0BPNtaHYfqCAtwXIggKMy2
+Z4GoiIeLoBlg+1c47wTw/NcpL+JBSd1VSMq65+KDaHaQrxGtGBOiQTEzDJi4jRKN
+JiPECkIKzU9bdPeKn9wT4ubQyayMwhDqtsMYCJgTyUQauKH1bVxksvU7j2iI17p8
+7naIjHKTuVv8azuAics9Zdox5jEtC82Xo1FUOHk81vBApsUSgdGF3sYrl+a4tLZe
+NlcZEv6wlJpVDy/EsUvh
+=vbcP
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
index 4640eab155f627bb32a14c4cd5a65caffe05367f..7945b46617e6303666198daebf61579ff1aca9ea 100644 (file)
--- 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