Merge branch 'branch-netatalk-2-1'

diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index fc479fe70fb8584b15c4a5d43f474e82b933c3bf..bb42b1eaa9653d818ab69cd89fd014bcc7aecd4b 100644 (file)
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -43,6 +43,10 @@ ATALK_BGROUND=no
 # 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