Merge branch 'branch-netatalk-2-1'

diff --cc distrib/initscripts/rc.atalk.debian.tmpl
index fc479fe70fb8584b15c4a5d43f474e82b933c3bf,b9654764c33813f9f69de6491a0f909df8b5bcab..bb42b1eaa9653d818ab69cd89fd014bcc7aecd4b
--- 1/distrib/initscripts/rc.atalk.debian.tmpl
--- 2/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@@ -18,31 -18,23 +18,35 @@@ NAME=netatal
  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`
+ # next netatalk 2.2 will not expect $HOSTNAME.
+ 
  # Read in netatalk configuration.
  if [ -f /etc/default/netatalk ]; then
      . /etc/default/netatalk