summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2007-02-09 14:36:56 +0000
committerAdam Tkac <atkac@fedoraproject.org>2007-02-09 14:36:56 +0000
commit168cdeae16cb7cf1281ae17ddb0011a3cd060316 (patch)
tree07d02e0e771f0647bd234b1ee2f60632c1d229ff
parentf47d1818a70440e1ab2f80cce9e8b93c1be1ba42 (diff)
fixed broken bind-chroot-admin scriptbind-9_3_4-6_fc7
-rw-r--r--bind-chroot-admin.in11
-rw-r--r--bind.spec5
2 files changed, 10 insertions, 6 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()
diff --git a/bind.spec b/bind.spec
index 4ef03b5..de3a742 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: 5%{?dist}
+Release: 6%{?dist}
Epoch: 31
Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-root
@@ -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)