Merge branch-2-1

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

diff --git a/distrib/initscripts/rc.atalk.sysv.tmpl b/distrib/initscripts/rc.atalk.sysv.tmpl
index ee979d2d4e8bfd9341de2e9683dfa9a4eba0a7e3..85ec0748f5b6add6f72f3522d3b5dd42e41915b2 100755 (executable)
--- a/distrib/initscripts/rc.atalk.sysv.tmpl
+++ b/distrib/initscripts/rc.atalk.sysv.tmpl
@@ -2,7 +2,8 @@
 #
 # Start/stop the Netatalk daemons.
 #
-# 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.
 #
@@ -17,18 +18,37 @@ killproc() {
        [ "$pid" != "" ] && kill $pid
 }
 
-# netatalk.conf expects hostname in $HOSTNAME by default
+# default
+ATALK_NAME=`hostname|cut -d. -f1`
+ATALK_UNIX_CHARSET='LOCALE'
+ATALK_MAC_CHARSET='MAC_ROMAN'
+
+CNID_METAD_RUN=yes
+AFPD_RUN=yes
+AFPD_MAX_CLIENTS=20
+AFPD_UAMLIST="-U uams_dhx.so,uams_dhx2.so"
+AFPD_GUEST=nobody
+CNID_CONFIG="-l log_note"
+
+ATALKD_RUN=no
+PAPD_RUN=no
+TIMELORD_RUN=no
+#A2BOOT_RUN=no
+ATALK_ZONE=
+ATALK_BGROUND=no
+
+# old netatalk.conf expected hostname in $HOSTNAME by default
 HOSTNAME=`hostname`
 
 . :ETCDIR:/netatalk.conf
 
 
 #
-# Start the appletalk server processes.
+# Start the netatalk server processes.
 #
 
 atalk_startup() {
-       echo 'starting appletalk daemons: \c'
+       echo 'starting netatalk daemons: \c'
        if [ x"${ATALKD_RUN}" != x"no" ]; then
                if [ -x :SBINDIR:/atalkd ]; then
                        :SBINDIR:/atalkd;               echo ' atalkd\c'
@@ -66,7 +86,7 @@ atalk_startup() {
 case "$1" in
 
 'start')
-        if [ x"${ATALK_BGROUND}" = x"yes" ]; then
+        if [ x"${ATALK_BGROUND}" = x"yes" -a x"${ATALKD_RUN}" != x"no" ]; then
             echo "Starting netatalk in the background ... "
             atalk_startup > /dev/null &
         else
@@ -75,11 +95,11 @@ case "$1" in
         ;;
 
 #
-# Stop the appletalk server processes.
+# Stop the netatalk server processes.
 #
 'stop')
 
-       echo 'stopping appletalk daemons:\c'
+       echo 'stopping netatalk daemons:\c'
 
        if [ -x :SBINDIR:/papd ]; then
                killproc papd;                  echo ' papd\c'