merge from branch-netatalk-2-1

diff --git a/NEWS b/NEWS
index 802fff2c6bb9762823f2f4df301d424779f7e9e1..f87c36567799927d26576b99559a97b4325edadd 100644 (file)
--- 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 206e01ca072e0221a4c7b9ce44f61ab6dbccd836..5ed475c556acff5b1c9b4ed3a0c83c86d9c6f148 100644 (file)
--- 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