Modified SuSE initscript. pooba53 <bobo@bocklabs.wisc.edu>

diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index a5fbbb89ecf16bdbbb3050d144d66754c9fb7fe3..49f092129643e813c7a32d74fd37c250235bf4f0 100755 (executable)
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -1,11 +1,13 @@
 #! /bin/sh
-# Copyright (c) 1996 S.u.S.E. GmbH Fuerth, Germany.  All rights reserved.
+# Copyright (c) 1996-2001 S.u.S.E. GmbH Fuerth, Germany.  All rights reserved.
 #
 # Author: 
 #       Reinhold Sojer, <reinhold@suse.de>
+#       Olaf Hering, <olh@suse.de>
 # 
 # adapted to 1.4.99 (at 00-11-15) : Thomas Schierle, <ts@visual-s.de>
 # template changes 2001-02-14     : jeff <jeff@univrel.pr.uconn.edu>
+# template changes 2001-11-16     : Daniel E. Lautenschleger, <bobo@bocklabs.wisc.edu>
 
 . /etc/rc.config
 
@@ -23,25 +25,60 @@ test "$START_ATALK" = "yes" || exit 0
 
 # The echo return value for success (defined in /etc/rc.config).
 return=$rc_done
+
+# Startup code
+atalk_startup() {
+    if [ x"${ATALKD_RUN}" != x"no" ]; then
+        echo -n "  Starting atalkd:"
+        :SBINDIR:/atalkd
+
+        if [ -x :BINDIR:/nbprgstr ]; then
+            :BINDIR:/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}"
+            :BINDIR:/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}"
+    
+        fi
+
+        if [ x"${PAPD_RUN}" = x"yes"  -a -x :SBINDIR:/papd ]; then
+            echo -n "  Starting papd:"
+            :SBINDIR:/papd
+        fi
+            
+        if [ x"${TIMELORD_RUN}" = x"yes"  -a -x :SBINDIR:/timelord ]; then
+            echo -n "  Starting timelord"
+            :SBIN:/timelord
+        fi
+          
+    fi   
+
+    if [ x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ] ; then
+            echo -n "  Starting afpd:"
+            echo ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
+               -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME}${ATALK_ZONE}
+            startproc :SBINDIR:/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
+               -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME}${ATALK_ZONE}
+    fi
+        
+        touch /var/lock/subsys/atalk
+}
+
 case "$1" in
     start)
-        echo -n "Starting netatalk:"
-        :SBINDIR:/atalkd
-        :BINDIR:/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}"
-        :BINDIR:/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}"
-        startproc :SBINDIR:/papd || return=$rc_failed
-        startproc :SBINDIR:/timelord || return=$rc_failed
-        startproc :SBINDIR:/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
-          -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}" || \
-          return=$rc_failed
-        echo -e "$return"
+        if [ x"${ATALK_BGROUND}" = x"yes" ]; then
+            echo "Starting netatalk in the background ... "
+            atalk_startup >& /dev/null &
+        else
+            echo "Starting netatalk (this may take a while) ..."
+            atalk_startup
+        fi
         ;;
     stop)
         echo -n "Shutting down netatalk:"
-        killproc -TERM :SBINDIR:/papd || return=$rc_failed
-        killproc -TERM :SBINDIR:/timelord || return=$rc_failed
-        killproc -TERM :SBINDIR:/afpd || return=$rc_failed
-        killproc -TERM :SBINDIR:/atalkd || return=$rc_failed
+        killproc -TERM :SBINDIR:/papd
+        if test -x :SBINDIR:/timelord ; then
+          killproc -TERM :SBINDIR:/timelord
+        fi
+        killproc -TERM :SBINDIR:/atalkd
+        killproc -TERM :SBINDIR:/afpd
         echo -e "$return"
         ;;
     restart|reload)
@@ -51,10 +88,13 @@ case "$1" in
         echo -n "Checking for service atalk:"
         checkproc :SBINDIR:/papd && echo -n "OK" || echo -n "No process"
         checkproc :SBINDIR:/afpd && echo -n "OK" || echo "No process"
+        if test -x :SBINDIR:/timelord ; then
+          checkproc :SBINDIR:/timelord || return=$rc_failed
+        fi
         checkproc :SBINDIR:/atalkd && echo "OK" || echo "No process"
         ;;
-    *)
-        echo "Usage: $0 {start|stop}"
+    *)   
+        echo "Usage: $0 {start|stop|restart|status}"
         exit 1
         ;;
 esac