- marked caching-nameserver as obsolete (#244604)

- fixed typo in initscript (causes that named doesn't detect NetworkManager
    correctly)
- next cleanup in configuration - moved configfiles into config.tar
- removed delay between start & restart in initscript

1 files changed, 1 insertions, 2 deletions

diff --git a/named.init b/named.init
index 8c3176e..2e1863a 100755
--- a/named.init
+++ b/named.init
@@ -53,7 +53,7 @@ if [ -z $dbusEnabled ] && [ -z "$DISABLE_NAMED_DBUS" ] ; then
       dbusEnabled=1;
     fi;
   done
-  [ -z $NetworkManagerEnabled ] || OPTIONS="$OPTIONS -D";
+  [ -z $dbusEnabled ] || OPTIONS="$OPTIONS -D";
 fi;
 
 # Check if all what named needs running
@@ -212,7 +212,6 @@ rhstatus() {
 }	
 restart() {
 	stop
-	sleep 2
 	start
 }	
 reload() {