[gentoo-commits] gentoo-x86 commit in net-analyzer/icinga/files: icinga-init.d-2

[Matt Thode (prometheanfire)]

prometheanfire    12/01/08 18:41:16

  Modified:             icinga-init.d-2
  Log:
  fixed init, reload was not working.  readded checkconfig function to fix
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  net-analyzer/icinga/files/icinga-init.d-2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2?r1=1.4&r2=1.5

Index: icinga-init.d-2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d-2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icinga-init.d-2	4 Dec 2011 19:27:46 -0000	1.4
+++ icinga-init.d-2	8 Jan 2012 18:41:15 -0000	1.5
@@ -8,6 +8,14 @@
 	after mysql postgresql ido2db
 }
 
+checkconfig() {
+	# Silent Check
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
 reload()
 {
 	checkconfig || return 1