summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-03-03 20:18:11 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-03-03 20:18:11 +0000
commit91893c8a78f297b23e80344fa4d9ccbe47f9fd48 (patch)
tree91f14c3e88f5af62e35b2fad37c7c8f90a65f2e7 /net-dns
parentNew addition, written by me (diff)
downloadgentoo-2-91893c8a78f297b23e80344fa4d9ccbe47f9fd48.tar.gz
gentoo-2-91893c8a78f297b23e80344fa4d9ccbe47f9fd48.tar.bz2
gentoo-2-91893c8a78f297b23e80344fa4d9ccbe47f9fd48.zip
Check chroot on restart.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/bind/ChangeLog5
-rw-r--r--net-dns/bind/files/named.init-r1010
2 files changed, 13 insertions, 2 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 3334ecc99264..f4e1d61df4e7 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dns/bind
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.324 2011/03/01 17:53:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.325 2011/03/03 20:18:11 idl0r Exp $
+
+ 03 Mar 2011; Christian Ruppert <idl0r@gentoo.org> files/named.init-r10:
+ Check chroot on restart.
*bind-9.8.0 (01 Mar 2011)
diff --git a/net-dns/bind/files/named.init-r10 b/net-dns/bind/files/named.init-r10
index 99fea011d48f..3acc998d7703 100644
--- a/net-dns/bind/files/named.init-r10
+++ b/net-dns/bind/files/named.init-r10
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.2 2011/02/27 22:27:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.3 2011/03/03 20:18:11 idl0r Exp $
opts="start stop reload restart checkconfig checkzones"
@@ -174,6 +174,14 @@ stop() {
# Workaround for now, until openrc's restart has been fixed.
# openrc doesn't care about a restart() function in init scripts.
if [ "${RC_CMD}" = "restart" ]; then
+ if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+ check_chroot || {
+ eend 1
+ eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+ return 1
+ }
+ fi
+
checkconfig || { eend 1; return 1; }
fi