From: HAT <hat@fa2.so-net.ne.jp>
Date: Tue, 11 Jan 2011 16:35:09 +0000 (+0900)
Subject: sysv and debian initscript: compatibility with old netatalk.conf
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=507a8e4711b55358da06a8167118ea2daf5ec386

sysv and debian initscript: compatibility with old netatalk.conf
---

diff --git a/NEWS b/NEWS
index f87c3656..f5740490 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,6 @@ Changes in 2.2beta1
 ====================
 
 * FIX: composition of Surrogate Pair
-* FIX: Ubuntu's servername was empty
 
 Changes in 2.2alpha5
 ====================
@@ -64,6 +63,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 e3e7f568..fc479fe7 100644
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -40,6 +40,9 @@ TIMELORD_RUN=no
 ATALK_ZONE=
 ATALK_BGROUND=no
 
+# old /etc/default/netatalk expected hostname in $HOSTNAME by default
+HOSTNAME=`/bin/hostname`
+
 # Read in netatalk configuration.
 if [ -f /etc/default/netatalk ]; then
     . /etc/default/netatalk
diff --git a/distrib/initscripts/rc.atalk.sysv.tmpl b/distrib/initscripts/rc.atalk.sysv.tmpl
index a4b9a69e..85ec0748 100755
--- a/distrib/initscripts/rc.atalk.sysv.tmpl
+++ b/distrib/initscripts/rc.atalk.sysv.tmpl
@@ -37,6 +37,9 @@ TIMELORD_RUN=no
 ATALK_ZONE=
 ATALK_BGROUND=no
 
+# old netatalk.conf expected hostname in $HOSTNAME by default
+HOSTNAME=`hostname`
+
 . :ETCDIR:/netatalk.conf