Merge from branch-2-1

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

diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index 7fce712f635e17e5b1bce933f4ac8a11e34ebb34..6f5d9f0b8185e15b1149a5566d95b8ff5ac5e41c 100644 (file)
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -19,7 +19,7 @@ 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
 AFPD_UAMLIST="-U uams_dhx2.so"
@@ -101,16 +101,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 "."
        ;;