--- nagios
+++ nagios
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $
 
-opts="${opts} reload checkconfig"
+extra_commands="checkconfig"
+extra_started_commands="reload"
 
 depend() {
 	need net
@@ -15,7 +16,7 @@
 {
 	checkconfig || return 1
 	ebegin "Reloading configuration"
-	killall -HUP nagios &>/dev/null
+	start-stop-daemon --signal HUP --pidfile /var/nagios/nagios.lock
 	eend $?
 }
 
@@ -34,7 +35,7 @@
 	touch /var/nagios/nagios.log /var/nagios/status.sav
 	chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
 	rm -f /var/nagios/rw/nagios.cmd
-	start-stop-daemon --quiet --start --startas /usr/sbin/nagios \
+	start-stop-daemon --quiet --start --exec /usr/sbin/nagios \
 		-e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
 		-- -d /etc/nagios/nagios.cfg
 	eend $?