From 09b577aeb9640afcf7928214083d9daa42a9f7fa Mon Sep 17 00:00:00 2001
From: franklahm <franklahm>
Date: Tue, 19 May 2009 11:56:22 +0000
Subject: [PATCH] Fix cnid_metad -l option

---
 config/netatalk.conf                     |  2 +-
 distrib/initscripts/rc.atalk.bsd.tmpl    |  7 ++++++-
 distrib/initscripts/rc.atalk.debian.tmpl | 10 +++++++---
 distrib/initscripts/rc.atalk.gentoo.tmpl |  8 ++++++--
 distrib/initscripts/rc.atalk.redhat.tmpl |  6 +++++-
 distrib/initscripts/rc.atalk.suse.tmpl   |  6 +++++-
 distrib/initscripts/rc.atalk.sysv.tmpl   |  7 ++++++-
 7 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 458fe1a3..101c83b0 100644
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -36,4 +36,4 @@ export ATALK_MAC_CHARSET
 export ATALK_UNIX_CHARSET
 
 # log config for cnid_metad and cnid_dbd
-CNID_DBD_LOGCONFIG="-l default log_note"
\ No newline at end of file
+# CNID_DBD_LOGCONFIG="default log_note"
\ No newline at end of file
diff --git a/distrib/initscripts/rc.atalk.bsd.tmpl b/distrib/initscripts/rc.atalk.bsd.tmpl
index a6b7249c..778996ca 100755
--- a/distrib/initscripts/rc.atalk.bsd.tmpl
+++ b/distrib/initscripts/rc.atalk.bsd.tmpl
@@ -30,7 +30,12 @@ if [ -x :SBINDIR:/papd ]; then
 fi
 
 if [ -x :SBINDIR:/cnid_metad ]; then
-	:SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG";		echo -n ' cnid_metad'
+    if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+        :SBINDIR:/cnid_metad
+    else
+        :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+    fi
+    echo -n ' cnid_metad'
 fi
 
 if [ -x :SBINDIR:/afpd ]; then
diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index e408819c..81395274 100644
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -4,7 +4,7 @@
 #
 # Author:       Thomas Kaiser <Thomas.Kaiser@phg-online.de>
 #
-# Version:      $Id: rc.atalk.debian.tmpl,v 1.4 2009-04-30 10:48:38 franklahm Exp $
+# Version:      $Id: rc.atalk.debian.tmpl,v 1.5 2009-05-19 11:56:23 franklahm Exp $
 
 set -e
 
@@ -41,8 +41,12 @@ atalk_startup() {
 	# prepare startup of file services
 	if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
 		echo -n " cnid_metad"
-		:SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
-	fi
+        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+            :SBINDIR:/cnid_metad
+        else
+            :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+        fi
+    fi
 	
 	if [ x"$AFPD_RUN" = x"yes" ]; then
 	:SBINDIR:/afpd $AFPD_UAMLIST -g $AFPD_GUEST -c $AFPD_MAX_CLIENTS \
diff --git a/distrib/initscripts/rc.atalk.gentoo.tmpl b/distrib/initscripts/rc.atalk.gentoo.tmpl
index 53d51eb4..203c2f7c 100644
--- a/distrib/initscripts/rc.atalk.gentoo.tmpl
+++ b/distrib/initscripts/rc.atalk.gentoo.tmpl
@@ -35,8 +35,12 @@ atalk_startup () {
 	fi
 
 	if [ "${CNID_METAD_RUN}" = "yes" ] ; then
-        	ebegin "Starting cnid_metad"
-		start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
+        ebegin "Starting cnid_metad"
+        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+		    start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad
+        else
+		    start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+        fi
 		eend $?
 	fi
 
diff --git a/distrib/initscripts/rc.atalk.redhat.tmpl b/distrib/initscripts/rc.atalk.redhat.tmpl
index 658d7631..a9349d0a 100644
--- a/distrib/initscripts/rc.atalk.redhat.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat.tmpl
@@ -101,7 +101,11 @@ atalk_startup() {
 
     if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ] ; then
 	    echo -n "  Starting cnid_metad:"
-	    daemon ${ATALK_SBIN}/cnid_metad "$CNID_DBD_LOGCONFIG"
+        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+            daemon ${ATALK_SBIN}/cnid_metad
+        else
+            daemon ${ATALK_SBIN}/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+        fi
 	    RETVAL_CNID_METAD=$?
 	    echo
     fi
diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index c2d5ef1f..39987826 100755
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -58,7 +58,11 @@ atalk_startup() {
 
     if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
 	    echo -n "  Starting cnid_metad:"
-	    startproc :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
+        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+            startproc :SBINDIR:/cnid_metad
+        else
+            startproc :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+        fi
     fi
 
     if [ x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ] ; then
diff --git a/distrib/initscripts/rc.atalk.sysv.tmpl b/distrib/initscripts/rc.atalk.sysv.tmpl
index 14f9c044..2263084f 100755
--- a/distrib/initscripts/rc.atalk.sysv.tmpl
+++ b/distrib/initscripts/rc.atalk.sysv.tmpl
@@ -50,7 +50,12 @@ atalk_startup() {
 	fi
 
 	if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ]; then
-		:SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG";			echo ' cnid_metad\c'
+        if [ "x$CNID_DBD_LOGCONFIG" = "x" ]; then
+            :SBINDIR:/cnid_metad
+        else
+            :SBINDIR:/cnid_metad -l "$CNID_DBD_LOGCONFIG"
+        fi
+        echo ' cnid_metad\c'
 	fi
 
 	if [  x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ]; then
-- 
2.39.2