6fcc99
update to auto-enable of D-BUS if NetworkManager enabled
|
@@ -676,7 +676,6 @@ exit 0
|
|
|
676
676
|
%{_libdir}/libbind.so*
|
|
677
677
|
%defattr(0644,root,root,0755)
|
|
678
678
|
%{_libdir}/libbind.a
|
|
679
|
-
%{_libdir}/libbind.so
|
|
680
679
|
%{_libdir}/pkgconfig/libbind.pc
|
|
681
680
|
%{_includedir}/bind
|
|
682
681
|
%{_mandir}/man3/libbind-*
|
|
@@ -64,13 +64,6 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then
|
|
|
64
64
|
fi;
|
|
65
65
|
fi;
|
|
66
66
|
|
|
67
|
-
NetworkManagerEnabled=0
|
|
68
|
-
for l in 0 1 2 3 4 5 6; do
|
|
69
|
-
if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then
|
|
70
|
-
NetworkManagerEnabled=1;
|
|
71
|
-
fi;
|
|
72
|
-
done
|
|
73
|
-
|
|
74
67
|
dbusEnabled=0;
|
|
75
68
|
for a in $OPTIONS; do
|
|
76
69
|
if [ $a = "-D" ]; then
|
|
@@ -78,9 +71,17 @@ for a in $OPTIONS; do
|
|
|
78
71
|
fi;
|
|
79
72
|
done
|
|
80
73
|
|
|
81
|
-
if [ $dbusEnabled -eq 0 ] && [
|
|
82
|
-
|
|
83
|
-
|
|
74
|
+
if [ $dbusEnabled -eq 0 ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
|
|
75
|
+
NetworkManagerEnabled=0
|
|
76
|
+
for l in 0 1 2 3 4 5 6; do
|
|
77
|
+
if /sbin/chkconfig --level=$l NetworkManager >/dev/null 2>&1; then
|
|
78
|
+
NetworkManagerEnabled=1;
|
|
79
|
+
fi;
|
|
80
|
+
done
|
|
81
|
+
if [ $NetworkManagerEnabled -eq 1 ]; then
|
|
82
|
+
OPTIONS="$OPTIONS -D";
|
|
83
|
+
fi;
|
|
84
|
+
dbusEnabled=1;
|
|
84
85
|
fi
|
|
85
86
|
|
|
86
87
|
start() {
|
|
@@ -21,3 +21,9 @@
|
|
|
21
21
|
ENABLE_SDB=yes -- This enables use of 'named_sdb', which has support
|
|
22
22
|
-- for the ldap, pgsql and dir zone database backends
|
|
23
23
|
-- compiled in, to be used instead of named.
|
|
24
|
+
|
|
25
|
+
DISABLE_NAMED_DBUS=[1y]-- If NetworkManager is enabled in any runlevel, then
|
|
26
|
+
# the initscript will by default enable named's D-BUS
|
|
27
|
+
# support with the named -D option. This setting disables
|
|
28
|
+
this behavior.
|
|
29
|
+
|