diff options
author | Adam Tkac <atkac@fedoraproject.org> | 2007-11-19 14:03:28 +0000 |
---|---|---|
committer | Adam Tkac <atkac@fedoraproject.org> | 2007-11-19 14:03:28 +0000 |
commit | 072956c6a296cc9ebdc77abb3c1cd3deaff8139b (patch) | |
tree | 8b38cb985b1e914efd4e9fad7790848e528f0338 | |
parent | 31f7ce1b8baa5e1a70df865df93c59e16de1528a (diff) | |
download | bind-072956c6a296cc9ebdc77abb3c1cd3deaff8139b.tar.gz bind-072956c6a296cc9ebdc77abb3c1cd3deaff8139b.tar.xz bind-072956c6a296cc9ebdc77abb3c1cd3deaff8139b.zip |
- removed statement from initscript which passes -D to namedbind-9_5_0-18_a7_fc9
-rw-r--r-- | bind.spec | 5 | ||||
-rwxr-xr-x | named.init | 16 | ||||
-rw-r--r-- | named.sysconfig | 5 |
3 files changed, 4 insertions, 22 deletions
@@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.5.0 -Release: 17.%{RELEASEVER}%{?dist} +Release: 18.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -665,6 +665,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Mon Nov 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.a7 +- removed statement from initscript which passes -D to named + * Thu Nov 15 2007 Adam Tkac <atkac redhat com> 32:9.5.0-17.a7 - 9.5.0a7 - dropped patches (upstream) @@ -42,22 +42,6 @@ if [ -n "$ROOTDIR" ]; then fi; fi -# Manage forwarders through D-BUS? -for a in $OPTIONS; do - if [ $a = "-D" ]; then - dbusEnabled=1; - fi; -done - -if [ -z $dbusEnabled ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then - for l in 0 1 2 3 4 5 6; do - if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then - dbusEnabled=1; - fi; - done - [ -z $dbusEnabled ] || OPTIONS="$OPTIONS -D"; -fi; - # Check if all what named needs running start() { diff --git a/named.sysconfig b/named.sysconfig index 622b691..421dfa1 100644 --- a/named.sysconfig +++ b/named.sysconfig @@ -10,9 +10,4 @@ # OPTIONS="whatever" -- These additional options will be passed to named # at startup. Don't add -t here, use ROOTDIR instead. # -# DISABLE_NAMED_DBUS=[1y]-- If NetworkManager is enabled in any runlevel, then -# the initscript will by default enable named's D-BUS -# support with the named -D option. This setting disables -# this behavior. -# # KEYTAB_FILE="/dir/file" -- Specify named service keytab file (for GSS-TSIG) |