Merge from branch-2-1

[netatalk.git] / distrib / initscripts / rc.atalk.redhat.tmpl

diff --git a/distrib/initscripts/rc.atalk.redhat.tmpl b/distrib/initscripts/rc.atalk.redhat.tmpl
index b4fd785e0253f294a72dac7834e44ebc0027d42d..bdcd9f0f8c5491a70f1f17fb877edb2cfe1915ed 100644 (file)
--- a/distrib/initscripts/rc.atalk.redhat.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat.tmpl
@@ -19,27 +19,9 @@ ATALK_SBIN=:SBINDIR:
 # Source networking configuration.
 . /etc/sysconfig/network
 
-if [ ! -x ${ATALK_SBIN}/atalkd ]; then
-     # Quickly probe for appletalk and warn if we can't find it
-     #/sbin/modprobe appletalk || echo "[could not load appletalk module]"
-     # Check for IP Encapsulation support
-     #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]"
-     echo "[${ATALK_SBIN}/atalkd not found.  Did it compile?]";
-     exit 0;
-fi
-
-if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
-     echo "[${ATALK_CONF_DIR}/netatalk.conf not found]";
-     exit 0;
-fi
-
 # read in netatalk configuration
-. ${ATALK_CONF_DIR}/netatalk.conf
-
-# Check that networking is up.
-if [ ${NETWORKING} = "no" ]; then
-     echo "[Network isn't started]"; 
-     exit 0;
+if [ -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
+    . ${ATALK_CONF_DIR}/netatalk.conf
 fi
 
 # initialize return values
@@ -51,7 +33,22 @@ RETVAL_AFPD=0
 
 # startup code for everything
 atalk_startup() {
-    if [ x"${ATALKD_RUN}" != x"no" ]; then 
+    # Check that networking is up.
+    if [ ${NETWORKING} = "no" ]; then
+         echo "[Network isn't started]"; 
+         exit 1;
+    fi
+
+    if [ ! -f ${ATALK_CONF_DIR}/netatalk.conf ]; then
+         echo "[${ATALK_CONF_DIR}/netatalk.conf not found]";
+         exit 6;
+    fi
+
+    if [ x"${ATALKD_RUN}" != x"no" -a -x ${ATALK_SBIN}/atalkd ]; then 
+         # Quickly probe for appletalk and warn if we can't find it
+         #/sbin/modprobe appletalk || echo "[could not load appletalk module]"
+         # Check for IP Encapsulation support
+         #/sbin/modprobe ipddp || echo "[could not load IP encapsulation]"
        echo -n "  Starting atalkd:"
        daemon ${ATALK_SBIN}/atalkd
        RETVAL_ATALKD=$?
@@ -210,11 +207,16 @@ case "$1" in
        ;;
   'status')
        status atalkd
+       status papd
+       status timelord
+       status a2boot
+       status cnid_metad
+       status afpd
        RETVAL=$?
        ;;
   *)
-       echo "Usage: atalk {start|stop|restart|status}"
-       exit 1
+       echo "Usage: $0 {start|stop|restart|reload|status}"
+       exit 2
 esac
 
 exit $RETVAL