rpms/bind
6
0
Fork 1
Code Issues Pull Requests Releases Activity

update to auto-enable of D-BUS if NetworkManager enabled

Browse Source
This commit is contained in:
jvdias 2006-07-20 18:40:14 +00:00
parent e76b450f1c
commit 6fcc997885
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bind.spec
View File

@ -676,7 +676,6 @@ exit 0
%{_libdir}/libbind.so* %{_libdir}/libbind.so*
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_libdir}/libbind.a %{_libdir}/libbind.a
%{_libdir}/libbind.so
%{_libdir}/pkgconfig/libbind.pc %{_libdir}/pkgconfig/libbind.pc
%{_includedir}/bind %{_includedir}/bind
%{_mandir}/man3/libbind-* %{_mandir}/man3/libbind-*

21
named.init
View File

@ -64,13 +64,6 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then
fi; fi;
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; dbusEnabled=0;
for a in $OPTIONS; do for a in $OPTIONS; do
if [ $a = "-D" ]; then if [ $a = "-D" ]; then
@ -78,9 +71,17 @@ for a in $OPTIONS; do
fi; fi;
done done
if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then if [ $dbusEnabled -eq 0 ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
OPTIONS="$OPTIONS -D"; NetworkManagerEnabled=0
dbusEnabled=1; 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 fi
start() { start() {

6
named.sysconfig
View File

@ -21,3 +21,9 @@
# ENABLE_SDB=yes -- This enables use of 'named_sdb', which has support # ENABLE_SDB=yes -- This enables use of 'named_sdb', which has support
# -- for the ldap, pgsql and dir zone database backends # -- for the ldap, pgsql and dir zone database backends
# -- compiled in, to be used instead of named. # -- 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.
#