From 4a5f0b3e4b4e18278ecca52a1acdcf07fa867645 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 5 Jun 2010 09:38:09 +0000 Subject: Rephrase the chroot part of pkg_postinst and /etc/conf.d/named as suggested in bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>. (Portage version: 2.2_rc67/cvs/Linux x86_64) --- net-dns/bind/ChangeLog | 7 ++++++- net-dns/bind/bind-9.6.2_p2.ebuild | 11 +++++------ net-dns/bind/bind-9.7.0_p2-r1.ebuild | 11 +++++------ net-dns/bind/files/named.confd-r3 | 9 +++++---- 4 files changed, 21 insertions(+), 17 deletions(-) (limited to 'net-dns/bind') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 2fca3ebd5675..96b101d67d8c 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dns/bind # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.276 2010/06/03 16:57:17 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.277 2010/06/05 09:38:08 idl0r Exp $ + + 05 Jun 2010; Christian Ruppert bind-9.6.2_p2.ebuild, + bind-9.7.0_p2-r1.ebuild, files/named.confd-r3: + Rephrase the chroot part of pkg_postinst and /etc/conf.d/named as + suggested in bug 321457, thanks to Duncan <1i5t5.duncan@cox.net>. 03 Jun 2010; Christian Ruppert bind-9.6.2_p2.ebuild, bind-9.7.0_p2-r1.ebuild: diff --git a/net-dns/bind/bind-9.6.2_p2.ebuild b/net-dns/bind/bind-9.6.2_p2.ebuild index bfacc43c73d9..d3ec553e9ab5 100644 --- a/net-dns/bind/bind-9.6.2_p2.ebuild +++ b/net-dns/bind/bind-9.6.2_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.2 2010/06/03 16:57:18 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.3 2010/06/05 09:38:08 idl0r Exp $ EAPI="3" @@ -262,11 +262,10 @@ pkg_postinst() { einfo einfo "You can edit /etc/conf.d/named to customize named settings" einfo - einfo "If you like to run bind in chroot AND this is a new install OR" - einfo "your bind doesn't already run in chroot, simply run:" - einfo "\`emerge --config '=${CATEGORY}/${PF}'\`" - einfo "Before running the above command you might want to change the chroot" - einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used." + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" einfo CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) diff --git a/net-dns/bind/bind-9.7.0_p2-r1.ebuild b/net-dns/bind/bind-9.7.0_p2-r1.ebuild index 255760bf39aa..6cdd8029e497 100644 --- a/net-dns/bind/bind-9.7.0_p2-r1.ebuild +++ b/net-dns/bind/bind-9.7.0_p2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.2 2010/06/03 16:57:17 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.3 2010/06/05 09:38:08 idl0r Exp $ EAPI="3" @@ -262,11 +262,10 @@ pkg_postinst() { einfo einfo "You can edit /etc/conf.d/named to customize named settings" einfo - einfo "If you like to run bind in chroot AND this is a new install OR" - einfo "your bind doesn't already run in chroot, simply run:" - einfo "\`emerge --config '=${CATEGORY}/${PF}'\`" - einfo "Before running the above command you might want to change the chroot" - einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used." + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" einfo CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) diff --git a/net-dns/bind/files/named.confd-r3 b/net-dns/bind/files/named.confd-r3 index 3d1694b516ee..959514fd97f5 100644 --- a/net-dns/bind/files/named.confd-r3 +++ b/net-dns/bind/files/named.confd-r3 @@ -9,10 +9,11 @@ OPTIONS="" # RNDC needs to be told what server we're using sometimes. #SERVER="-s 127.0.0.1" -# If you wish to run bind in a chroot, run: -# emerge --config = -# and un-comment the following line. -# You can specify a different chroot directory but MAKE SURE it's empty. +# If you wish to run bind in a chroot: +# 1) un-comment the CHROOT= assignment, below. You may use +# a different chroot directory but MAKE SURE it's empty. +# 2) run: emerge --config = +# # CHROOT="/chroot/dns" # Default pid file location -- cgit v1.2.3-65-gdbad