From: ankry <ankry@pld-linux.org>
Date: Sun, 4 May 2003 20:17:15 +0000 (+0000)
Subject: - cleaning
X-Git-Tag: STABLE~7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdictd.git;a=commitdiff_plain;h=52c7bcfd9f98b08d47942190de80720ce05610bf

- cleaning

Changed files:
    dictd.init -> 1.5
---

diff --git a/dictd.init b/dictd.init
index c5fd58c..c2fd5e6 100644
--- a/dictd.init
+++ b/dictd.init
@@ -35,9 +35,13 @@ generate_dictdconf() {
 # Get network config
 . /etc/sysconfig/network
 
-if is_no "${NETWORKING}"; then
-	msg_network_down ${DAEMON_FILE}
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network ]; then
+		msg_network_down ${DAEMON_FILE}
+		exit 1
+	fi
+else
+	exit 0
 fi
 
 # Get sysconfig
@@ -63,7 +67,7 @@ case "$1" in
 		msg_already_running ${DAEMON_NAME}
 		exit 1
 	fi
-        ;;
+	;;
   stop)
 	if [ -f /var/lock/subsys/${DAEMON_FILE} ]; then
 		msg_stopping ${DAEMON_NAME}
@@ -76,12 +80,12 @@ case "$1" in
 	fi	
 	;;
   status)
-        status ${DAEMON_FILE}
-        ;;
+	status ${DAEMON_FILE}
+	;;
   restart|reload)
-        $0 stop
-        $0 start
-        ;;
+	$0 stop
+	$0 start
+	;;
     *)
 	msg_usage "$0 {start|stop|restart|reload|status}"
 	exit 1