prometheanfire 15/05/03 05:25:06 Modified: icinga2.initd Log: fixing reload in init script bug 548302 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.8 net-analyzer/icinga2/files/icinga2.initd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/files/icinga2.initd?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/files/icinga2.initd?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/files/icinga2.initd?r1=1.7&r2=1.8 Index: icinga2.initd =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/files/icinga2.initd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- icinga2.initd 13 Mar 2015 21:09:51 -0000 1.7 +++ icinga2.initd 3 May 2015 05:25:06 -0000 1.8 @@ -68,12 +68,14 @@ } reload() { - ebegin "Checking icinga2 configuration" - "$DAEMON" daemon --validate >/dev/null 2>&1 - if [ $? -ne 0 ]; then - eerror "Icinga2 detected configuration errors, run '$DAEMON daemon --validate' for details" - return 1 - fi + checkconfig || return 1 + ebegin "Reloading icinga2" start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE" + + local retval=$? + if [ $retval -ne 0 ]; then + ewarn "Error reloading icinga2." + fi + eend $retval }
