sysv and debian initscript: compatibility with old netatalk.conf

diff --git a/NEWS b/NEWS
index f87c36567799927d26576b99559a97b4325edadd..f5740490e2e79ebb7ad24f4445f3122a388615db 100644 (file)
--- 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 e3e7f56896581c69b0a241f52ccb8b732983972f..fc479fe70fb8584b15c4a5d43f474e82b933c3bf 100644 (file)
--- 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 a4b9a69ef94cbcb3443e7a76a697f966b9cea2e3..85ec0748f5b6add6f72f3522d3b5dd42e41915b2 100755 (executable)
--- 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