Merge branch-2-1

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

diff --git a/distrib/initscripts/rc.atalk.gentoo.tmpl b/distrib/initscripts/rc.atalk.gentoo.tmpl
index 203c2f7c938cde3642d325607d3f5a2a6e12d993..5ed475c556acff5b1c9b4ed3a0c83c86d9c6f148 100644 (file)
--- a/distrib/initscripts/rc.atalk.gentoo.tmpl
+++ b/distrib/initscripts/rc.atalk.gentoo.tmpl
@@ -1,9 +1,28 @@
 #!/sbin/runscript
 
-# 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.
 
+ATALK_NAME=`echo ${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
+
 depend() {
        need net
        use logger dns
@@ -36,11 +55,8 @@ atalk_startup () {
 
        if [ "${CNID_METAD_RUN}" = "yes" ] ; then
         ebegin "Starting cnid_metad"
-        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
-                   start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad
-        else
-                   start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
-        fi
+               start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad -- \
+                       ${CNID_CONFIG}
                eend $?
        fi
 
@@ -63,7 +79,7 @@ atalk_startup () {
 start () {
        . :ETCDIR:/netatalk.conf
 
-        if [ x"${ATALK_BGROUND}" = x"yes" ]; then
+        if [ x"${ATALK_BGROUND}" = x"yes" -a "${ATALKD_RUN}" != "no" ]; then
             echo "Starting netatalk in the background ... "
             atalk_startup >& /dev/null &
         else