Convert the init script from myservice to SVCNAME and allow . and - as separator in multiple instances mode.

(Portage version: 2.1.1_pre5-r1)

2 files changed, 15 insertions, 11 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 82f36fed89fb..97647ec3bb92 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.34 2006/07/11 04:32:42 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.35 2006/08/15 19:35:52 swegener Exp $
+
+  15 Aug 2006; Sven Wegener <swegener@gentoo.org> files/pdns:
+  Convert the init script from myservice to SVCNAME and allow . and - as
+  separator in multiple instances mode.
 
   11 Jul 2006; Joshua Jackson <tsunam@gentoo.org> pdns-2.9.20-r1.ebuild:
   Stable x86 ;bug #136288
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 3e7826027b24..2d8373b3475b 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.7 2006/04/30 00:14:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.8 2006/08/15 19:35:52 swegener Exp $
 
 opts="${opts} reload monitor dump"
 
@@ -10,9 +10,9 @@ PDNS_INSTANCE="default"
 PDNS_CONFIG=""
 
 # Multiple instances support
-if [[ "${myservice:0:5}" = "pdns-" && -n "${myservice:5}" ]]
+if [[ ${SVCNAME:0:5} = pdns[.-] && -n ${SVCNAME:5} ]]
 then
-	PDNS_INSTANCE="${myservice:5}"
+	PDNS_INSTANCE="${SVCNAME:5}"
 	PDNS_CONFIG="--config-name=${PDNS_INSTANCE}"
 fi
 
@@ -22,7 +22,7 @@ depend() {
 
 start() {
 	ebegin "Starting PowerDNS (${PDNS_INSTANCE})"
-	/usr/sbin/pdns_server ${PDNS_CONFIG} --daemon --guardian=yes
+	/usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=yes --guardian=yes
 	eend $?
 }
 
@@ -38,14 +38,14 @@ reload() {
 	eend $?
 }
 
-monitor() {
-       ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
-       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console --loglevel=9
-       eend $?
-}
-
 dump() {
        ebegin "Dumping PowerDNS (${PDNS_INSTANCE}) variables"
        /usr/bin/pdns_control ${PDNS_CONFIG} list
        eend $?
 }
+
+monitor() {
+       ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
+       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9
+       eend $?
+}