diff options
| author | Tomas Hozza <thozza@redhat.com> | 2013-11-12 14:29:33 +0100 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2013-11-12 14:29:33 +0100 |
| commit | 3267c0ac549035c0e7987b9a1dec92d9965b6dfa (patch) | |
| tree | c90252af7b3a79e690c8b791af8f40fe1626b6be | |
| parent | cb97bbcb9f5393438a29b844408311e4ace1a4a5 (diff) | |
Install configuration for rwtab and fix chroot setup script
Signed-off-by: Tomas Hozza <thozza@redhat.com>
| -rw-r--r-- | bind.spec | 10 | ||||
| -rw-r--r-- | named.rwtab | 6 | ||||
| -rwxr-xr-x | setup-named-chroot.sh | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -27,7 +27,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.9.4 -Release: 7%{?PATCHVER}%{?PREVER}%{?dist} +Release: 8%{?PATCHVER}%{?PREVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,7 @@ Source39: named-sdb.service Source40: named-sdb-chroot.service Source41: setup-named-chroot.sh Source42: generate-rndc-key.sh +Source43: named.rwtab # Common patches Patch5: bind-nonexec.patch @@ -523,6 +524,9 @@ done mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d install -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_sysconfdir}/tmpfiles.d/named.conf +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d +install -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named + %pre if [ "$1" -eq 1 ]; then /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; @@ -631,6 +635,7 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.iscdlv.key %config(noreplace) %attr(0644,root,named) %{_sysconfdir}/named.root.key %{_sysconfdir}/tmpfiles.d/named.conf +%{_sysconfdir}/rwtab.d/named %{_unitdir}/named.service %{_sysconfdir}/NetworkManager/dispatcher.d/13-named %{_sbindir}/named-journalprint @@ -799,6 +804,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Nov 12 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-8 +- Install configuration for rwtab and fix chroot setup script + * Thu Oct 31 2013 Tomas Hozza <thozza@redhat.com> 32:9.9.4-7 - Correct the upstream patch for #794940 diff --git a/named.rwtab b/named.rwtab new file mode 100644 index 0000000..2cb3a41 --- /dev/null +++ b/named.rwtab @@ -0,0 +1,6 @@ +dirs /var/named + +files /var/named/named.ca +files /var/named/named.empty +files /var/named/named.localhost +files /var/named/named.loopback diff --git a/setup-named-chroot.sh b/setup-named-chroot.sh index 6071f75..9f96278 100755 --- a/setup-named-chroot.sh +++ b/setup-named-chroot.sh @@ -44,7 +44,7 @@ mount_chroot_conf() # Mount source is a directory. Mount it only if directory in chroot is # empty. if [ -e "$all" ] && [ `ls -1A $ROOTDIR$all | wc -l` -eq 0 ]; then - mount --bind "$all" "$ROOTDIR$all" + mount --rbind "$all" "$ROOTDIR$all" fi fi done |