summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2010-10-24 20:47:17 +0000
committerChristian Ruppert <idl0r@gentoo.org>2010-10-24 20:47:17 +0000
commitb7423ab7330c3eedc6145773613269f09927225f (patch)
treeb22836fee85eecaa8ae6f45ed482aee72d117183 /net-dns/bind/files
parentUpdated homepage wrt bug 333689. (diff)
downloadgentoo-2-b7423ab7330c3eedc6145773613269f09927225f.tar.gz
gentoo-2-b7423ab7330c3eedc6145773613269f09927225f.tar.bz2
gentoo-2-b7423ab7330c3eedc6145773613269f09927225f.zip
Revision bump due to baselayout-1 compatibility fixes.
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/bind/files')
-rw-r--r--net-dns/bind/files/named.confd-r44
-rw-r--r--net-dns/bind/files/named.init-r85
2 files changed, 5 insertions, 4 deletions
diff --git a/net-dns/bind/files/named.confd-r4 b/net-dns/bind/files/named.confd-r4
index 6fdb00e238d0..633977a90c47 100644
--- a/net-dns/bind/files/named.confd-r4
+++ b/net-dns/bind/files/named.confd-r4
@@ -1,6 +1,6 @@
# Set various named options here.
#
-OPTIONS=""
+#OPTIONS=""
# Set this to the number of processors you want bind to use.
# Leave this unchanged if you want bind to automatically detect the number
@@ -21,7 +21,7 @@ OPTIONS=""
# RNDC needs to be told what server we're using sometimes.
#SERVER="-s 127.0.0.1"
# rndc key to use
-RNDC_KEY="${CHROOT}/etc/bind/rndc.key"
+#RNDC_KEY="${CHROOT}/etc/bind/rndc.key"
# Default pid file location
PIDFILE="${CHROOT}/var/run/named/named.pid"
diff --git a/net-dns/bind/files/named.init-r8 b/net-dns/bind/files/named.init-r8
index 9af3b2ffcabd..954107b9b72b 100644
--- a/net-dns/bind/files/named.init-r8
+++ b/net-dns/bind/files/named.init-r8
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r8,v 1.2 2010/10/18 17:26:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r8,v 1.3 2010/10/24 20:47:17 idl0r Exp $
opts="start stop reload restart"
@@ -173,7 +173,8 @@ reload() {
rndc $SERVER -k $RNDC_KEY reload 1>/dev/null
ret=$?
elif [ -n "${PIDFILE}" ]; then
- start-stop-daemon --pidfile $PIDFILE --signal HUP
+ # FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally...
+ start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named
ret=$?
else
ewarn "Neither an rndc key has been specified nor a pidfile... this is"