- release 2

[packages/dictd.git] / dictd.init

diff --git a/dictd.init b/dictd.init
index c5fd58cc8bc8a52f2f290fb136d3e3f67164891b..eee3e176dd8f0fbba35ab6ccee8507ede17d7820 100644 (file)
--- a/dictd.init
+++ b/dictd.init
@@ -8,25 +8,25 @@
 #              a client to access dictionary definitions from a set of \
 #              natural language dictionary databases.
 # processname: dictd
-# config:      /etc/dictd.conf 
+# config:      /etc/dictd.conf
 # config:      /etc/dictd/*
 
 DAEMON_FILE=dictd
-DAEMON_NAME="Dictionary Daemon"  
+DAEMON_NAME="Dictionary Daemon"
 DAEMON_CONF=/etc/dictd.conf
 
 generate_dictdconf() {
     umask 022
-    if ls /etc/dictd/*.dictconf >/dev/null 2>&1; then 
+    if ls /etc/dictd/*.dictconf >/dev/null 2>&1; then
        echo "# DO NOT EDIT! This file is autogenerated by $0." >$DAEMON_CONF
        echo "# To configure dictd edit /etc/dictd/* files and restart daemon"\
            >>$DAEMON_CONF
        cat /etc/dictd/dictd-main.conf /etc/dictd/*.dictconf >>$DAEMON_CONF
        return 0
-    fi 
+    fi
 
     echo "$0: $(nls 'no dictionaries found')"
-    return 1   
+    return 1
 }
 
 # Source function library.
@@ -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 -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down ${DAEMON_FILE}
+               exit 1
+       fi
+else
+       exit 0
 fi
 
 # Get sysconfig
@@ -49,43 +53,41 @@ case "$1" in
   start)
        [ -x /usr/sbin/${DAEMON_FILE} ] || exit 0
        if [ ! -f /var/lock/subsys/${DAEMON_FILE} ]; then
-               if generate_dictdconf; then 
+               if generate_dictdconf; then
                        msg_starting ${DAEMON_NAME}
                        daemon ${DAEMON_FILE} ${DICTD_OPTS}
                        pidofproc ${DAEMON_FILE} >/dev/null 2>&1
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && \
                            touch /var/lock/subsys/${DAEMON_FILE}
-               else  
+               else
                        exit 1
-               fi    
+               fi
        else
                msg_already_running ${DAEMON_NAME}
-               exit 1
        fi
-        ;;
+       ;;
   stop)
        if [ -f /var/lock/subsys/${DAEMON_FILE} ]; then
                msg_stopping ${DAEMON_NAME}
-               busy
-               killproc /usr/sbin/${DAEMON_FILE} 
+               killproc /usr/sbin/${DAEMON_FILE}
                rm -f /var/lock/subsys/${DAEMON_FILE} >/dev/null 2>&1
        else
                msg_not_running ${DAEMON_NAME}
-               exit 1
-       fi      
+       fi
        ;;
   status)
-        status ${DAEMON_FILE}
-        ;;
-  restart|reload)
-        $0 stop
-        $0 start
-        ;;
-    *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       status ${DAEMON_FILE}
+       exit $?
        ;;
+  restart|force-reload)
+       $0 stop
+       $0 start
+       exit $?
+       ;;
+    *)
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL