[gentoo-commits] gentoo-x86 commit in net-dns/unbound/files: unbound.initd

["Matsuu Takuto (matsuu)" <matsuu@gentoo.org>]

matsuu      11/09/13 15:14:49

  Modified:             unbound.initd
  Log:
  Fixed python modules handling. The patch was submitted by Tom Hendrikx, bug #378395. Removed oknodo from unbound.initd, bug #379947.
  
  (Portage version: 2.1.10.15/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-dns/unbound/files/unbound.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/unbound/files/unbound.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/unbound/files/unbound.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/unbound/files/unbound.initd?r1=1.1&r2=1.2

Index: unbound.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unbound.initd	22 Nov 2009 16:57:33 -0000	1.1
+++ unbound.initd	13 Sep 2011 15:14:49 -0000	1.2
@@ -1,9 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v 1.1 2009/11/22 16:57:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/files/unbound.initd,v 1.2 2011/09/13 15:14:49 matsuu Exp $
+
+name="unbound daemon"
+extra_commands="configtest"
+extra_started_commands="reload"
+description="unbound is a Domain Name Server (DNS) that is used to resolve host names to IP address."
+description_configtest="Run syntax tests for configuration files only."
+description_reload="Kills all children and reloads the configuration."
 
-opts="${opts} checkconfig reload"
 
 UNBOUND_BINARY=${UNBOUND_BINARY:-/usr/sbin/unbound}
 UNBOUND_CHECKCONF=${UNBOUND_CHECKCONF:-/usr/sbin/unbound-checkconf}
@@ -21,9 +27,15 @@
 	return $?
 }
 
+configtest() {
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
 start() {
 	checkconfig || return $?
-	ebegin "Starting unbound"
+	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --pidfile "${UNBOUND_PIDFILE}" \
 		--exec "${UNBOUND_BINARY}" -- -c "${UNBOUND_CONFFILE}"
 	eend $?
@@ -31,21 +43,14 @@
 
 stop() {
 	checkconfig || return $?
-	ebegin "Stopping unbound"
+	ebegin "Stopping ${SVCNAME}"
 	start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}"
 	eend $?
 }
 
-restart() {
-	checkconfig || return $?
-	svc_stop
-	svc_start
-}
-
 reload() {
 	checkconfig || return $?
-	ebegin "Reloading unbound"
-	start-stop-daemon --stop --pidfile "${UNBOUND_PIDFILE}" \
-		--signal HUP --oknodo
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${UNBOUND_PIDFILE}"
 	eend $?
 }