From f47d1818a70440e1ab2f80cce9e8b93c1be1ba42 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Feb 07 2007 16:38:48 +0000 Subject: fixed bind-chroot script (#227600) --- diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index fc87221..99d9f90 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -21,6 +21,15 @@ # # BIND_CHROOT_PREFIX=${BIND_CHROOT_PREFIX:-@BIND_CHROOT_PREFIX@} + +if [ -e /etc/sysconfig/named ]; then + BIND_CHROOT_PREFIX=`grep "ROOTDIR" /etc/sysconfig/named |grep \"` + if [ `expr match "$BIND_CHROOT_PREFIX" '#'` -lt `expr match "$BIND_CHROOT_PREFIX" '"'` ]; then + BIND_CHROOT_PREFIX=${BIND_CHROOT_PREFIX#*\"} + BIND_CHROOT_PREFIX=${BIND_CHROOT_PREFIX%#*} + BIND_CHROOT_PREFIX=${BIND_CHROOT_PREFIX%\"*} + fi +fi BIND_DIR=${BIND_DIR:-@BIND_DIR@} function usage() diff --git a/bind.spec b/bind.spec index f343f54..4ef03b5 100644 --- a/bind.spec +++ b/bind.spec @@ -17,7 +17,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -744,6 +744,9 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Wed Feb 07 2007 Adam Tkac 31:9.3.4-5.fc7 +- bind-chroot-admin now uses correct chroot path (#227600) + * Mon Feb 05 2007 Adam Tkac 31:9.3.4-4.fc7 - fixed conflict between bind-sdb and ldap - removed duplicated bind directory in bind-libs