diff options
| author | jvdias <jvdias@fedoraproject.org> | 2006-07-21 20:36:45 +0000 |
|---|---|---|
| committer | jvdias <jvdias@fedoraproject.org> | 2006-07-21 20:36:45 +0000 |
| commit | ba41335b017f9c8ca6dff376fda03a9239718b02 (patch) | |
| tree | 625d2c5fd84904210743ac667995e22ace1ae6a3 | |
| parent | 77c3ce0b9cae81c155bdb1d028be227df9b170f1 (diff) | |
fix addenda to bugs 189789, 196398
| -rw-r--r-- | bind-chroot-admin.in | 5 | ||||
| -rw-r--r-- | bind.spec | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 9395c6e..e748d99 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -52,10 +52,7 @@ function rootdir() function selinux_enabled() { - [ -e /etc/selinux/config ] && . /etc/selinux/config; - if [ -n "$SELINUX" ] && [ "$SELINUX" != 'disabled' ] ; then - return 0; - fi; + while read d mp fs rest; do if [ "$fs" = "selinuxfs" ]; then return 0; fi; done < /proc/mounts return 1; } @@ -17,7 +17,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.3.2 -Release: 30%{?dist} +Release: 32%{?dist} Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -519,7 +519,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.115 2006/07/20 18:40:14 jvdias 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.116 2006/07/21 20:36:45 jvdias 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: @@ -844,6 +844,14 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Fri Jul 21 2006 Jason Vas Dias <jvdias@redhat.com> - 30:9.3.2-32 +- fix addenda to bug 189789: + determination of selinux enabled was still not 100% correct in bind-chroot-admin +- fix addenda to bug 196398: + make named.init test for NetworkManager being enabled AFTER testing for -D absence; + named.init now supports a 'DISABLE_NAMED_DBUS' /etc/sysconfig/named setting to disable + auto-enable of named dbus support if NetworkManager enabled. + * Wed Jul 19 2006 Jason Vas Dias <jvdias@redhat.com> - 30:9.3.2-30 - fix bug 196398 - Enable -D option automatically in initscript if NetworkManager enabled in any runlevel. |