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

1 files changed, 11 insertions, 10 deletions

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() {