Enable default startup of cnid_metad in various startup scripts.

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 4d3bef9c9972a2e23a7d508826e8c3adafe6d512..745c2e213c4e55e727b052db47db948ea2eb40cc 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -19,6 +19,7 @@ AFPD_GUEST=nobody
 # Set which daemons to run (papd is dependent upon atalkd):
 ATALKD_RUN=yes
 PAPD_RUN=yes
+CNID_METAD_RUN=yes
 AFPD_RUN=yes
 TIMELORD_RUN=no
 A2BOOT_RUN=no

diff --git a/config/netatalk.conf.cobalt b/config/netatalk.conf.cobalt
index 6c1f3623f18fba1ae31b1252ca5e28652432e63d..cf5ab6ac189e13213eb4bf8647840b1d80a55b90 100644 (file)
--- a/config/netatalk.conf.cobalt
+++ b/config/netatalk.conf.cobalt
@@ -16,6 +16,7 @@ AFPD_GUEST=nobody
 
 # Set which daemons to run:
 PAPD_RUN=no
+CNID_METAD_RUN=yes
 AFPD_RUN=yes
 
 # Control whether the daemons are started in the background

diff --git a/distrib/initscripts/rc.atalk.bsd.tmpl b/distrib/initscripts/rc.atalk.bsd.tmpl
index fd81fad1f2ed8eded52a544b24aeeed596aabfb9..a24474d2541328299610f671b326f83ebb069655 100755 (executable)
--- a/distrib/initscripts/rc.atalk.bsd.tmpl
+++ b/distrib/initscripts/rc.atalk.bsd.tmpl
@@ -29,6 +29,10 @@ if [ -x :SBINDIR:/papd ]; then
        :SBINDIR:/papd;         echo -n ' papd'
 fi
 
+if [ -x :SBINDIR:/cnid_metad ]; then
+       :SBINDIR:/cnid_metad;           echo -n ' cnid_metad'
+fi
+
 if [ -x :SBINDIR:/afpd ]; then
        :SBINDIR:/afpd;         echo -n ' afpd'
 fi

diff --git a/distrib/initscripts/rc.atalk.cobalt b/distrib/initscripts/rc.atalk.cobalt
index 7ccbb5bedaefb5124c4865dcbef9368802c81ef5..8c92802aa068f394ad7c932ff4716df4d5a8aa17 100644 (file)
--- a/distrib/initscripts/rc.atalk.cobalt
+++ b/distrib/initscripts/rc.atalk.cobalt
@@ -48,6 +48,7 @@ test -f /etc/atalk/netatalk.conf || exit 0
 RETVAL=1
 RETVAL_ATALKD=0
 RETVAL_PAPD=0
+RETVAL_CNID_METAD=0
 RETVAL_AFPD=0
 
 # startup code for everything
@@ -71,13 +72,18 @@ atalk_startup() {
        fi
     fi
 
+    if [ x"${CNID_METAD_RUN}" = x"yes" -a -x /usr/sbin/cnid_metad ] ; then
+           daemon /usr/sbin/cnid_metad
+           RETVAL_CNID_METAD=$?
+    fi
+
     if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ] ; then
            daemon /usr/sbin/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
                -c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}"
            RETVAL_AFPD=$?
     fi
 
-    if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
+    if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_CNID_METAD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
         RETVAL=0
        touch /var/lock/subsys/atalk || RETVAL=1
     fi
@@ -127,7 +133,12 @@ case "$1" in
            RETVAL_AFPD=$?
        fi
 
-       if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then
+       if [ x"${CNID_METAD_RUN}" = x"yes" -a -x /usr/sbin/cnid_metad ]; then
+           killproc cnid_metad
+           RETVAL_CNID_METAD=$?
+       fi
+
+       if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_CNID_METAD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then
            RETVAL=0
            rm -f /var/lock/subsys/atalk || RETVAL=1
        fi

diff --git a/distrib/initscripts/rc.atalk.redhat.tmpl b/distrib/initscripts/rc.atalk.redhat.tmpl
index 4a7b79bba55814a78f8803095534e5e9f0a89b70..330ca139fa20e5e7dbf53f18bbcb1a5595781963 100644 (file)
--- a/distrib/initscripts/rc.atalk.redhat.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat.tmpl
@@ -48,6 +48,7 @@ fi
 RETVAL=1
 RETVAL_ATALKD=0
 RETVAL_PAPD=0
+RETVAL_CNID_METAD=0
 RETVAL_AFPD=0
 
 # startup code for everything
@@ -100,6 +101,13 @@ atalk_startup() {
 
     fi
 
+    if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ] ; then
+           echo -n "  Starting cnid_metad:"
+           daemon ${ATALK_SBIN}/cnid_metad
+           RETVAL_CNID_METAD=$?
+           echo
+    fi
+
     if [ x"${AFPD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/afpd ] ; then
            echo -n "  Starting afpd:"
            daemon ${ATALK_SBIN}/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
@@ -108,7 +116,7 @@ atalk_startup() {
            echo
     fi
 
-    if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
+    if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_CNID_METAD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
         RETVAL=0
        touch /var/lock/subsys/atalk || RETVAL=1
     fi
@@ -184,6 +192,13 @@ case "$1" in
            echo
        fi
 
+       if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ]; then
+           echo -n "  Stopping cnid_metad:"
+           killproc cnid_metad
+           RETVAL_CNID_METAD=$?
+           echo
+       fi
+
        if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then
            RETVAL=0
            rm -f /var/lock/subsys/atalk || RETVAL=1

diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index 6718b01403b2ecc5d182870e93f730d2725f2551..b5f90207fb79e9dbe0db2da921ac14105a2c72de 100755 (executable)
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -56,6 +56,11 @@ atalk_startup() {
 
     fi
 
+    if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
+           echo -n "  Starting cnid_metad:"
+           startproc :SBINDIR:/cnid_metad
+    fi
+
     if [ x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ] ; then
            echo -n "  Starting afpd:"
            echo ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
@@ -82,9 +87,12 @@ case "$1" in
        killproc -TERM :SBINDIR:/papd
         if test -x :SBINDIR:/timelord ; then
          killproc -TERM :SBINDIR:/timelord
-        fi
+        fi        
        killproc -TERM :SBINDIR:/atalkd
        killproc -TERM :SBINDIR:/afpd
+       if test -x :SBINDIR:/cnid_metad ; then
+         killproc -TERM :SBINDIR:/cnid_metad
+        fi
        echo -e "$return"
        ;;
     restart|reload)
@@ -97,7 +105,10 @@ case "$1" in
         if test -x :SBINDIR:/timelord ; then
          checkproc :SBINDIR:/timelord || return=$rc_failed
         fi
-        checkproc :SBINDIR:/atalkd && echo "OK" || echo "No process"
+        if test -x :SBINDIR:/cnid_metad ; then
+         checkproc :SBINDIR:/cnid_metad || return=$rc_failed
+        fi
+        checkproc :SBINDIR:/atalkd && echo "OK" || echo "No process"   
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"

diff --git a/distrib/initscripts/rc.atalk.sysv b/distrib/initscripts/rc.atalk.sysv
index 3845f8ed63810acc7fd72b96cdf1305e7c0e1581..ad845fe69ecd5a88b71d4d0174484c12222b7d7d 100755 (executable)
--- a/distrib/initscripts/rc.atalk.sysv
+++ b/distrib/initscripts/rc.atalk.sysv
@@ -40,6 +40,10 @@ case "$1" in
                :SBINDIR:/papd;                 echo ' papd\c'
        fi
 
+       if [ -x :SBINDIR:/cnid_metad ]; then
+               :SBINDIR:/cnid_metad;                   echo ' cnid_metad\c'
+       fi
+
        if [ -x :SBINDIR:/afpd ]; then
                :SBINDIR:/afpd;                 echo ' afpd\c'
        fi
@@ -68,6 +72,10 @@ case "$1" in
                killproc afpd;                  echo ' afpd\c'
        fi
 
+       if [ -x :SBINDIR:/cnid_metad ]; then
+               killproc cnid_metad;                    echo ' cnid_metad\c'
+       fi
+
        if [ -x :SBINDIR:/timelord ]; then
                killproc timelord;              echo ' timelord\c'
        fi

diff --git a/distrib/initscripts/rc.atalk.tru64.tmpl b/distrib/initscripts/rc.atalk.tru64.tmpl
index 703645de88b740c2076c1de1ebcf1b6b2b042e84..fa9bb25201cc9ae330b2874322ccd3738a7db485 100755 (executable)
--- a/distrib/initscripts/rc.atalk.tru64.tmpl
+++ b/distrib/initscripts/rc.atalk.tru64.tmpl
@@ -14,6 +14,7 @@ ATALK_SBIN=:SBINDIR:
 ATALK_START_ATALKD=0
 ATALK_START_NBPRGSTR=0
 ATALK_START_PAPD=0
+ATALK_START_CNID_METAD=1
 ATALK_START_AFPD=1
 ATALK_START_TIMELORD=0
 
@@ -51,6 +52,10 @@ case "$1" in
                ${ATALK_SBIN}/papd;                     echo ' papd\c'
        fi
 
+       if [ ${ATALK_START_CNID_METAD} -eq 1 -a -x ${ATALK_SBIN}/cnid_metad ]; then
+               ${ATALK_SBIN}/cnid_metad;                       echo ' cnid_metad\c'
+       fi
+
        if [ ${ATALK_START_AFPD} -eq 1 -a -x ${ATALK_SBIN}/afpd ]; then
                ${ATALK_SBIN}/afpd;                     echo ' afpd\c'
        fi
@@ -79,6 +84,10 @@ case "$1" in
                killproc afpd;                  echo ' afpd\c'
        fi
 
+       if [ -x ${ATALK_SBIN}/cnid_metad ]; then
+               killproc cnid_metad;                    echo ' cnid_metad\c'
+       fi
+
        if [ -x ${ATALK_SBIN}/timelord ]; then
                killproc timelord;              echo ' timelord\c'
        fi