X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=distrib%2Finitscripts%2Frc.atalk.debian.tmpl;h=219f4ac944ae0255c75f4926ba5d749824c16dea;hb=33068a1e0441fc9eee0f5fb361226006ae3cba51;hp=b9654764c33813f9f69de6491a0f909df8b5bcab;hpb=a7e7b923bacabbe0d151fe0fce3de9258973172c;p=netatalk.git

diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index b9654764..219f4ac9 100644
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -4,10 +4,10 @@
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:      0 1 6
 ### END INIT INFO
 #
-# netatalk      Netatalk 2.x initscript
+# netatalk      Netatalk :NETATALK_VERSION: initscript
 # Author:       Thomas Kaiser <Thomas.Kaiser@phg-online.de>
 
 set -e
@@ -18,22 +18,29 @@ NAME=netatalk
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Guard to prevent execution if netatalk was removed.
-test -x :SBINDIR:/atalkd || exit 0
+test -x :SBINDIR:/afpd || exit 0
 
 # Set defaults. Please change these options in /etc/default/netatalk
+ATALK_NAME=`/bin/hostname --short`
+ATALK_UNIX_CHARSET='LOCALE'
+ATALK_MAC_CHARSET='MAC_ROMAN'
+
+CNID_METAD_RUN=yes
+AFPD_RUN=yes
+AFPD_MAX_CLIENTS=50
 AFPD_UAMLIST="-U uams_dhx2.so"
 AFPD_GUEST=nobody
-AFPD_MAX_CLIENTS=50
+CNID_CONFIG="-l log_note"
+
+ATALKD_RUN=no
+PAPD_RUN=no
+TIMELORD_RUN=no
+#A2BOOT_RUN=no
 ATALK_ZONE=
-ATALK_NAME=`/bin/hostname --short`
 ATALK_BGROUND=no
-CNID_METAD_RUN=yes
-ATALK_MAC_CHARSET='MAC_ROMAN'
-ATALK_UNIX_CHARSET='LOCALE'
 
-# /etc/default/netatalk expects hostname in $HOSTNAME by default
+# old /etc/default/netatalk expected hostname in $HOSTNAME by default
 HOSTNAME=`/bin/hostname`
-# next netatalk 2.2 will not expect $HOSTNAME.
 
 # Read in netatalk configuration.
 if [ -f /etc/default/netatalk ]; then
@@ -46,7 +53,7 @@ atalk_startup() {
 
 	# Try to load the AppleTalk kernel module if it was intended.
     if grep -q '^appletalk$' /etc/modules; then
-        /sbin/modprobe appletalk || echo "[could not load appletalk module]"
+		/sbin/modprobe appletalk || echo "[could not load appletalk module]"
     fi
 
 	# Start atalkd server.
@@ -86,7 +93,7 @@ atalk_startup() {
 
 case "$1" in
 	start)
-		if test "x$ATALK_BGROUND" = "xyes"; then
+		if [ "x$ATALK_BGROUND" = "xyes" -a "x$ATALKD_RUN" = "xyes" ]; then
 			echo "Starting Netatalk services in the background."
 			atalk_startup >/dev/null &
 		else
@@ -104,16 +111,20 @@ case "$1" in
 		echo -n " cnid_metad"
 		start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/cnid_metad
 	
-		echo -n " papd"
-		start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/papd
+		if test -x :SBINDIR:/papd; then
+                    echo -n " papd"
+		    start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/papd
+	        fi
 	
 		if test -x :SBINDIR:/timelord; then
                     echo -n " timelord"
 		    start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/timelord
 	        fi
 
-		echo -n " atalkd"
-		start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/atalkd
+		if test -x :SBINDIR:/atalkd; then
+                    echo -n " atalkd"
+		    start-stop-daemon --stop --quiet --oknodo --exec :SBINDIR:/atalkd
+	        fi
 	
 		echo "."
 	;;