diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2008-02-08 10:23:01 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2008-02-08 10:23:01 +0000 |
| commit | 17ffe02220c97f0d25754a0cb65474ec262d80f5 (patch) | |
| tree | f62098203e6e58aad2872272a85a8dd379e7a3db /bind-chroot-admin.in | |
| parent | 62d611d7dfa82552d98d0f745f10a5d76b852eaa (diff) | |
| download | bind-17ffe02220c97f0d25754a0cb65474ec262d80f5.tar.gz bind-17ffe02220c97f0d25754a0cb65474ec262d80f5.tar.xz bind-17ffe02220c97f0d25754a0cb65474ec262d80f5.zip | |
- reverted patch for #400461 (not correct)
- fixed wrong %{chroot}/dev/* labelling during fresh system installation
(#431202)
Diffstat (limited to 'bind-chroot-admin.in')
| -rw-r--r-- | bind-chroot-admin.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 3a431d4..59f50e2 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -97,11 +97,6 @@ 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; @@ -264,7 +259,8 @@ 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 - /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{dev,etc,var} >/dev/null 2>&1; +# XXX Do not restorecon ${chroot}/dev/*, done in initscript (#431202) + /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{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; |