diff options
author | jvdias <jvdias@fedoraproject.org> | 2006-07-20 18:40:14 +0000 |
---|---|---|
committer | jvdias <jvdias@fedoraproject.org> | 2006-07-20 18:40:14 +0000 |
commit | 6fcc997885b39c533b24387a84458d3022a044c1 (patch) | |
tree | 203b222c7344982d40a239092c7483e1e1292ba3 /named.init | |
parent | e76b450f1c89d9950c704b5ed4f5b10b8a155b82 (diff) | |
download | bind-6fcc997885b39c533b24387a84458d3022a044c1.tar.gz bind-6fcc997885b39c533b24387a84458d3022a044c1.tar.xz bind-6fcc997885b39c533b24387a84458d3022a044c1.zip |
update to auto-enable of D-BUS if NetworkManager enabled
Diffstat (limited to 'named.init')
-rwxr-xr-x | named.init | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -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() { |