From e31eda425bcf9874906f356b197ce4df0e70cec9 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Mon, 11 Feb 2008 15:47:01 +0000
Subject: - reverted 9.5.0-25.1.b1 changes

---
 bind-chroot-admin.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bind-chroot-admin.in')

diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in
index 59f50e2..3a431d4 100644
--- a/bind-chroot-admin.in
+++ b/bind-chroot-admin.in
@@ -97,6 +97,11 @@ function check_dirs()
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
     /bin/chown --preserve-root root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
     /bin/chmod --preserve-root 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
+    if selinux_enabled && [ -x /sbin/restorecon ]; then       
+       for dev in random zero null; do
+	   /sbin/restorecon ${BIND_CHROOT_PREFIX}/dev/$dev;
+       done
+    fi;
 }
 
 check_dirs;
@@ -259,8 +264,7 @@ function sync_files()
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-# XXX Do not restorecon ${chroot}/dev/*, done in initscript (#431202)
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{etc,var} >/dev/null 2>&1;
+	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{dev,etc,var} >/dev/null 2>&1;
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
-- 
cgit