Ubuntu's ATALK_NAME was empty (moved up from 2.2)

diff --git a/NEWS b/NEWS
index 565c523db6d4909164ddca460500d2f02323153c..e89f48f6ee4dcb3925119779a91ce8abe3b28509 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in 2.1.6
 
 * FIX: afpd: Fix for LDAP user cache corruption
 * FIX: gentoo: cannot set $CNID_CONFIG
+* FIX: ubuntu: servername was empty
 
 Changes in 2.1.5
 ================

diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index 7fce712f635e17e5b1bce933f4ac8a11e34ebb34..b9654764c33813f9f69de6491a0f909df8b5bcab 100644 (file)
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -9,7 +9,6 @@
 #
 # netatalk      Netatalk 2.x initscript
 # Author:       Thomas Kaiser <Thomas.Kaiser@phg-online.de>
-# Version:      $Id: rc.atalk.debian.tmpl,v 1.6 2009-06-09 11:58:49 franklahm Exp $
 
 set -e
 
@@ -32,6 +31,10 @@ CNID_METAD_RUN=yes
 ATALK_MAC_CHARSET='MAC_ROMAN'
 ATALK_UNIX_CHARSET='LOCALE'
 
+# /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