diff --git a/bind.spec b/bind.spec index bbe0b1c..7e52a14 100644 --- a/bind.spec +++ b/bind.spec @@ -676,7 +676,6 @@ exit 0 %{_libdir}/libbind.so* %defattr(0644,root,root,0755) %{_libdir}/libbind.a -%{_libdir}/libbind.so %{_libdir}/pkgconfig/libbind.pc %{_includedir}/bind %{_mandir}/man3/libbind-* diff --git a/named.init b/named.init index b3e0881..23f4faa 100755 --- a/named.init +++ b/named.init @@ -64,13 +64,6 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then fi; fi; -NetworkManagerEnabled=0 -for l in 0 1 2 3 4 5 6; do - if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then - NetworkManagerEnabled=1; - fi; -done - dbusEnabled=0; for a in $OPTIONS; do if [ $a = "-D" ]; then @@ -78,9 +71,17 @@ for a in $OPTIONS; do fi; done -if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then - OPTIONS="$OPTIONS -D"; - dbusEnabled=1; +if [ $dbusEnabled -eq 0 ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then + NetworkManagerEnabled=0 + for l in 0 1 2 3 4 5 6; do + if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then + NetworkManagerEnabled=1; + fi; + done + if [ $NetworkManagerEnabled -eq 1 ]; then + OPTIONS="$OPTIONS -D"; + fi; + dbusEnabled=1; fi start() { diff --git a/named.sysconfig b/named.sysconfig index 872bae2..395c956 100644 --- a/named.sysconfig +++ b/named.sysconfig @@ -21,3 +21,9 @@ # ENABLE_SDB=yes -- This enables use of 'named_sdb', which has support # -- for the ldap, pgsql and dir zone database backends # -- compiled in, to be used instead of named. +# +# 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. +#