diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2007-03-12 19:56:07 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2007-03-12 19:56:07 +0000 |
| commit | afe6eaf127123a2edcdcf25ca24a73b4ef1c25ca (patch) | |
| tree | 8819e0cd9199af472b478c7168d1fb836a7b0c15 /net-dns | |
| parent | Fixed startup order. (diff) | |
| download | gentoo-2-afe6eaf127123a2edcdcf25ca24a73b4ef1c25ca.tar.gz gentoo-2-afe6eaf127123a2edcdcf25ca24a73b4ef1c25ca.tar.bz2 gentoo-2-afe6eaf127123a2edcdcf25ca24a73b4ef1c25ca.zip | |
Remove bashisms from init script, bug #169636.
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/pdns/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dns/pdns/files/pdns | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog index af318018a84e..e4ef131da418 100644 --- a/net-dns/pdns/ChangeLog +++ b/net-dns/pdns/ChangeLog @@ -1,6 +1,9 @@ # 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.40 2006/11/23 17:19:49 vivo Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.41 2007/03/12 19:56:07 swegener Exp $ + + 12 Mar 2007; Sven Wegener <swegener@gentoo.org> files/pdns: + Remove bashisms from init script, bug #169636. 23 Nov 2006; Francesco Riosa <vivo@gentoo.org> pdns-2.9.20-r1.ebuild, pdns-2.9.20-r2.ebuild: diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns index 2d8373b3475b..2543bfded3e1 100644 --- a/net-dns/pdns/files/pdns +++ b/net-dns/pdns/files/pdns @@ -1,19 +1,18 @@ #!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.8 2006/08/15 19:35:52 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.9 2007/03/12 19:56:07 swegener Exp $ -opts="${opts} reload monitor dump" +opts="reload monitor dump" -# Default instance -PDNS_INSTANCE="default" +PDNS_INSTANCE="${SVCNAME#pdns[.-]}" PDNS_CONFIG="" -# Multiple instances support -if [[ ${SVCNAME:0:5} = pdns[.-] && -n ${SVCNAME:5} ]] +if [ -n "${PDNS_INSTANCE}" ] && [ "${PDNS_INSTANCE}" != "pdns" ] then - PDNS_INSTANCE="${SVCNAME:5}" PDNS_CONFIG="--config-name=${PDNS_INSTANCE}" +else + PDNS_INSTANCE="default" fi depend() { @@ -46,6 +45,6 @@ dump() { monitor() { ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode" - /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9 + /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9 --log-dns-details=yes --query-logging=yes eend $? } |