Merge branch 'branch-netatalk-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 b9654764c33813f9f69de6491a0f909df8b5bcab..bb42b1eaa9653d818ab69cd89fd014bcc7aecd4b 100644 (file)
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -18,18 +18,30 @@ 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
 ATALK_ZONE=
-ATALK_NAME=`/bin/hostname --short`
+CNID_CONFIG="-l log_note"
+
+ATALKD_RUN=no
+PAPD_RUN=no
+TIMELORD_RUN=no
+#A2BOOT_RUN=no
+ATALK_ZONE=
 ATALK_BGROUND=no
-CNID_METAD_RUN=yes
-ATALK_MAC_CHARSET='MAC_ROMAN'
-ATALK_UNIX_CHARSET='LOCALE'
+
+# old /etc/default/netatalk expected hostname in $HOSTNAME by default
+HOSTNAME=`/bin/hostname`
 
 # /etc/default/netatalk expects hostname in $HOSTNAME by default
 HOSTNAME=`/bin/hostname`
@@ -46,7 +58,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 +98,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 +116,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 "."
        ;;