Output of service atalk status was wrong

[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 330ca139fa20e5e7dbf53f18bbcb1a5595781963..66d8197178f6b8d0d84e5434f4396b3d7d8ba488 100644 (file)
--- a/distrib/initscripts/rc.atalk.redhat.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat.tmpl
@@ -1,11 +1,11 @@
 #! /bin/sh
-# chkconfig: 345 91 35
-# description: This package enables Linux to talk to Macintosh
-#              computers via the AppleTalk networking protocol and 
-#              provides printer, file sharing, and AppleTalk routing 
-#              services.   
+# chkconfig: - 91 35
+# description: This package is an implementation of "AFP over TCP"
+#              and provides printer, file sharing, and routing 
+#              services via legacy AppleTalk networking protocol.
 #
-# AppleTalk daemons. Make sure not to start atalkd in the background:
+# Netatalk daemons.
+# If you use AppleTalk, Make sure not to start atalkd in the background:
 # its data structures must have time to stablize before running the
 # other processes.
 
@@ -19,13 +19,11 @@ ATALK_SBIN=:SBINDIR:
 # Source networking configuration.
 . /etc/sysconfig/network
 
-# 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]"
-
 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
@@ -103,7 +101,7 @@ atalk_startup() {
 
     if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ] ; then
            echo -n "  Starting cnid_metad:"
-           daemon ${ATALK_SBIN}/cnid_metad
+        daemon ${ATALK_SBIN}/cnid_metad $CNID_CONFIG
            RETVAL_CNID_METAD=$?
            echo
     fi
@@ -124,7 +122,7 @@ atalk_startup() {
 
 case "$1" in
 'start')
-       echo -n 'Starting AppleTalk services: '
+       echo -n 'Starting Netatalk services: '
        if [ x"${ATALK_BGROUND}" = x"yes" ]; then 
            echo -n "(backgrounded)"
            atalk_startup >& /dev/null &
@@ -135,7 +133,7 @@ case "$1" in
        echo 
        ;;
 'stop')
-       echo 'Shutting down AppleTalk services: '
+       echo 'Shutting down Netatalk services: '
        if [ x"${ATALKD_RUN}" != x"no" ]; then
            if [ x"${PAPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/papd ]; then
                echo -n "  Stopping papd:"
@@ -212,6 +210,11 @@ case "$1" in
        ;;
   'status')
        status atalkd
+    status papd
+    status timelord
+    status a2boot
+    status cnid_metad
+    status afpd
        RETVAL=$?
        ;;
   *)