diff options
author | jvdias <jvdias@fedoraproject.org> | 2006-07-19 18:46:43 +0000 |
---|---|---|
committer | jvdias <jvdias@fedoraproject.org> | 2006-07-19 18:46:43 +0000 |
commit | bc0ace676aee99348884cba80a7b2e6f6462a39c (patch) | |
tree | 4bb2ab96666179270bce6df99db8cb9bbc76d3e1 /named.init | |
parent | 7129176f33f5ed3c562e29cc4e17ad5e47b85552 (diff) | |
download | bind-bc0ace676aee99348884cba80a7b2e6f6462a39c.tar.gz bind-bc0ace676aee99348884cba80a7b2e6f6462a39c.tar.xz bind-bc0ace676aee99348884cba80a7b2e6f6462a39c.zip |
fix bug 196398; fix namedGetForwarders for new dbus
Diffstat (limited to 'named.init')
-rwxr-xr-x | named.init | 28 |
1 files changed, 21 insertions, 7 deletions
@@ -60,9 +60,29 @@ if [ ! -r ${ROOTDIR}${named_conf} ] ; then echo Locating $ROOTDIR/${named_conf} failed: failure echo; + exit 1; 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 + dbusEnabled=1; + fi; +done + +if [ $dbusEnabled -eq 0 ] && [ $NetworkManagerEnabled -eq 1 ]; then + OPTIONS="$OPTIONS -D"; + dbusEnabled=1; +fi + start() { # Start daemons. echo -n $"Starting $named: " @@ -85,13 +105,7 @@ start() { if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 fi - dbus=0; - for a in $OPTIONS; do - if [ $a = "-D" ]; then - dbus=1; - fi; - done - if [ $dbus -eq 1 ]; then + if [ $dbusEnabled -eq 1 ]; then if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then mkdir -p ${ROOTDIR}/var/run/dbus if [ ! -d /var/run/dbus ] ; then |