diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-02-09 14:36:56 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-02-09 14:36:56 +0000 |
| commit | 564efa6711d70365c2310bfb9111e6f9a08157ea (patch) | |
| tree | e47f8ab231293ae1feffa9e1f1faf39f041a8539 | |
| parent | 8a78b00ee3ea70ba1f0590c9ec5c5f40a401078f (diff) | |
fixed broken bind-chroot-admin script
| -rw-r--r-- | bind-chroot-admin.in | 11 | ||||
| -rw-r--r-- | bind.spec | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 99d9f90..695fe00 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -23,13 +23,14 @@ 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%\"*} + BIND_CHROOT_PREFIX_TEMP=`grep "^\s*ROOTDIR" "/etc/sysconfig/named"` + BIND_CHROOT_PREFIX_TEMP=${BIND_CHROOT_PREFIX_TEMP#*\=} + BIND_CHROOT_PREFIX_TEMP=${BIND_CHROOT_PREFIX_TEMP%#*} + if [ ! ${#BIND_CHROOT_PREFIX_TEMP} -eq 0 ]; then + BIND_CHROOT_PREFIX=$BIND_CHROOT_PREFIX_TEMP 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: 5%{?dist} +Release: 6%{?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.161 2007/02/07 16:38:48 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.162 2007/02/09 14:36:56 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 +* Fri Feb 09 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-6.fc7 +- fixed broken bind-chroot-admin script (#227995) + * Wed Feb 07 2007 Adam Tkac <atkac@redhat.com> 31:9.3.4-5.fc7 - bind-chroot-admin now uses correct chroot path (#227600) |