summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2009-09-21 10:41:04 +0000
committerAdam Tkac <atkac@fedoraproject.org>2009-09-21 10:41:04 +0000
commitdb44b8ba7c90722d994d2808607f99aaeaab3927 (patch)
tree1a3d73c960e5fcd0e266ab82a40cc752e2e57222
parent463476dd2f6054d1f52de6c581f428a50b78bdb6 (diff)
downloadbind-db44b8ba7c90722d994d2808607f99aaeaab3927.tar.gz
bind-db44b8ba7c90722d994d2808607f99aaeaab3927.tar.xz
bind-db44b8ba7c90722d994d2808607f99aaeaab3927.zip
- determine file size via `stat` instead of `ls` (#523682)bind-9_6_1-11_P1_fc12
-rw-r--r--bind.spec5
-rwxr-xr-xnamed.init3
2 files changed, 5 insertions, 3 deletions
diff --git a/bind.spec b/bind.spec
index 024f320..2aa0e54 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.6.1
-Release: 10.%{PATCHVER}%{?dist}
+Release: 11.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -585,6 +585,9 @@ rm -rf ${RPM_BUILD_ROOT}
%ghost %{chroot_prefix}/etc/localtime
%changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.6.1-11.P1
+- determine file size via `stat` instead of `ls` (#523682)
+
* Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-10.P1
- improve chroot related documentation (#507795)
- add NetworkManager dispatcher script to reload named when network interface is
diff --git a/named.init b/named.init
index 0d40dfb..12540a2 100755
--- a/named.init
+++ b/named.init
@@ -76,8 +76,7 @@ mount_chroot_conf()
# If mount source is a file
if ! [ -d "$all" ]; then
# mount it only if it is not present in chroot or it is empty
- if ! [ -e "$ROOTDIR$all" ] ||
- [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+ if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
touch "$ROOTDIR$all"
mount --bind "$all" "$ROOTDIR$all"
fi