diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-02-07 16:38:48 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-02-07 16:38:48 +0000 |
| commit | 8a78b00ee3ea70ba1f0590c9ec5c5f40a401078f (patch) | |
| tree | b2cbdf7622964f7b18363c586b11ec0ba5e29e9d | |
| parent | 60dfcc10d895147e9a7a43c940771a102a0759a3 (diff) | |
| download | bind-8a78b00ee3ea70ba1f0590c9ec5c5f40a401078f.tar.gz bind-8a78b00ee3ea70ba1f0590c9ec5c5f40a401078f.tar.xz bind-8a78b00ee3ea70ba1f0590c9ec5c5f40a401078f.zip | |
fixed bind-chroot script (#227600)
| -rw-r--r-- | bind-chroot-admin.in | 9 | ||||
| -rw-r--r-- | bind.spec | 7 |
2 files changed, 14 insertions, 2 deletions
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() @@ -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 @@ -434,7 +434,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.160 2007/02/05 12:40:39 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.161 2007/02/07 16:38:48 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -744,6 +744,9 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Wed Feb 07 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-5.fc7 +- bind-chroot-admin now uses correct chroot path (#227600) + * Mon Feb 05 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-4.fc7 - fixed conflict between bind-sdb and ldap - removed duplicated bind directory in bind-libs |