Check chroot on restart.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 22 insertions, 11 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/Manifest b/net-dns/bind/Manifest
index e908ae83c2f9..3a453f9d2774 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -17,7 +17,7 @@ AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0
 AUX named.confd-r4 1295 RMD160 aa3a3da754405df0362b7ba67a730b5ed4f7da33 SHA1 23ce37d133bd46561b82874709fe784b4470e243 SHA256 061c6c2ffb72859b46c9e8ad8922000cf397c3f91a3681a8b1bf21493ec13491
 AUX named.confd-r5 1224 RMD160 b353a2bd8c73cbc1f967d04339d4f07db840a5ee SHA1 181a57e1b2c0371ad2704bb61f621498e2bfddff SHA256 00f06f96dc0cc7855bd15d31449b492e3a2502938e8038081c9f09e0d0ce7a08
 AUX named.confd-r6 1368 RMD160 8ea5c67af53a0986a09f1077a5dd722dd52c8b51 SHA1 64d5d6ead7fb5ba0ff8016b5fee2518fbde6f90c SHA256 704ac6954b2bad5d0bab19281dc703e86d9b4fe94d63dd00be1e525a3e64c492
-AUX named.init-r10 5685 RMD160 cf112ed23a7539164dc14323be1c5bc101c2196e SHA1 ed9f6a141fe487f3ab43f386ee935ae138a95ad8 SHA256 16fd046424d1493a178db97f7264423b3bbfdc9423949df3f8f9f01360555574
+AUX named.init-r10 5905 RMD160 551f299f62439bf565eb356a1373e982311d63d8 SHA1 3fd3d39714ee7b8b6c210de975625529fa641952 SHA256 4a256ab8748dd002a99ea63690b74c0efd93f3445f83c286912f15498eae3485
 AUX named.init-r5 1798 RMD160 a4cf8a2d19c79c40f7121559a5b0252204ede75b SHA1 0a131aa6b42050c6173c144d26a927f2fe5d3a1b SHA256 71153fce5461d4d85853218371599f5c909c625bacd9894b8a0ff16636773e05
 AUX named.init-r8 4417 RMD160 6aac0609b04e8cb3a1a91bf0532506be151a0e01 SHA1 5754951e9163cb0e7cfc2323c8d759c404ac8a27 SHA256 720880c274f14df595370e3fab257e32f08a0df0f3495a212cff86b6933b83d3
 AUX named.init-r9 4946 RMD160 48cce5a99a8da1eff3492c4896fbae4c1343a675 SHA1 944ed08d22e70ba93625814695535f58feed2083 SHA256 77fd6b4ecb0f7f4baa872d1be1b18d2ea9a913a15f30f63ab904a62ad4325748
@@ -40,16 +40,16 @@ EBUILD bind-9.6.3.ebuild 11264 RMD160 4b533d44aa49ba0bf5d048a6a0e731c5d303d043 S
 EBUILD bind-9.7.3-r1.ebuild 11624 RMD160 19690cfe501651256d1a2cc1901e93e317b79ce4 SHA1 6d85901298a213f6c4e5fec03b1fb222fa33a6b4 SHA256 b9b97ec7c2c869f51b1e64e3b87e8a63edd9f9dde6dae5f010189eac6b12f160
 EBUILD bind-9.7.3.ebuild 11374 RMD160 9c65021dfb7b8a5e2d5d1efd202d71355ef695aa SHA1 2ef602dc663c0259310e054c771e576a5f1f0e25 SHA256 5da52eab6748d8a03ff41464f39069942fc6cfe39e1a4b575b125151f4e10b1f
 EBUILD bind-9.8.0.ebuild 12237 RMD160 b3cad280dc1857100b82bfa294a7cf53418f4a9c SHA1 b33b8e11de14b87bc12feb38bdc827ee8250acaf SHA256 728a430e59a75e0aff535e9453a9f817a1f9dac4073b914f70681e406a5bfbd1
-MISC ChangeLog 55393 RMD160 05c758156349de62768ec2af74f00f0ae1dfee8d SHA1 6e009ec473ef79a54a136a8166f3b8bb24fe7762 SHA256 cbb4567b6ba4faa8b735c3adad1c20843fc700a39c459edcad89ae8bb1bb7700
+MISC ChangeLog 55495 RMD160 3353f05a2d924e5e999b182fce6d4f8a181f01d9 SHA1 9b1bce359a7c2360bd44686debee9a2e7f7e6c89 SHA256 eb5097ad8041c28a794fd7ac25c40f127e0a6020578b00479d1cd56c9a840502
 MISC metadata.xml 686 RMD160 04372d2e822125106bfbec86f7f754b2f8381250 SHA1 efe392ad948d348fb8c1a9a38558fb3cc3e892c8 SHA256 ac17c78fd6d997049a1b1e49be8142e78514bec66e85099c8e946b300fde7c4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNbTK5AAoJEMOx0zmdw4Z1eScH/jSEndDsd7YZ7KjR/EA9557l
-zSjcVQmg5vyV59jX8CJkoYkbwL8q/avaGkcbpIC8PfSjAy8qxUpyIUAiE8r0/Bzu
-WsgM2Fp9GZVr4sFc1QJ01qs6eGvwVualrINAvcj7EgrwsQ9izz73eEpx71QdUQZ6
-fFFq1zqEfjlHWuy7r9axvlwt0RcHhm4XLu3Nh2z+VHEQH+ZRoZRRJN/X3/OzjvmO
-i7ZhJ9nhw9hWJPWZL1PCKzEIcFnf2GSkQhB7+kLIhB95fM0xA6tSNZmY1R+yoHd/
-0VR+6QfOA1I6VbcvqeoeDG4o1qOfw8kDKzJYsJeCHAzyCiaXGYmpDi4td4CQ2WA=
-=iNHL
+iQEcBAEBCAAGBQJNb/eIAAoJEMOx0zmdw4Z1DhoH/j+wmKeMZs+mvQHbJ5V5N5gB
+Jue/A1J4vmrRW3TxfR/jQVHbwSsfl8tUuOzg870szUBtqQLH2XmLjSTRc/fyXzIR
+nhvKm6kVWVGXH3Y6u9lBSW3bgqSOq0HfRIEmMr54kMGMjVliO/nTKZOHxGQiix0w
+JMRsvv3x+fiSoXeS+x/xNcjuQ8ccgXOGy4exLvR5lLET8sxqhjgpmNsdDDQqsIdP
+FL6jjaSG0ittqza0smpwq6gepk5OUc6zA15s5sai5A2b2FziwqJjtnYu7BRlDZRe
+CVzMpFc5La/BErE92igobUkAWgiWuaWV2aJOXrh45zJiD0uy2uutQalCok6A5GE=
+=fqif
 -----END PGP SIGNATURE-----
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