From: HAT <hat@fa2.so-net.ne.jp>
Date: Tue, 11 Jan 2011 14:23:30 +0000 (+0900)
Subject: merge from branch-netatalk-2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=ab1a9b6884a935cc12e51858090cc80ca3735382

merge from branch-netatalk-2-1
---

diff --git a/NEWS b/NEWS
index 802fff2c..f87c3656 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,7 @@ Changes in 2.1.6
 ================
 
 * FIX: afpd: Fix for LDAP user cache corruption
+* FIX: gentoo: cannot set $CNID_CONFIG
 
 Changes in 2.1.5
 ================
diff --git a/distrib/initscripts/rc.atalk.gentoo.tmpl b/distrib/initscripts/rc.atalk.gentoo.tmpl
index 206e01ca..5ed475c5 100644
--- a/distrib/initscripts/rc.atalk.gentoo.tmpl
+++ b/distrib/initscripts/rc.atalk.gentoo.tmpl
@@ -55,7 +55,8 @@ atalk_startup () {
 
 	if [ "${CNID_METAD_RUN}" = "yes" ] ; then
         ebegin "Starting cnid_metad"
-		start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad $CNID_CONFIG
+		start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad -- \
+			${CNID_CONFIG}
 		eend $?
 	fi