Merge sf

diff --git a/NEWS b/NEWS
index 20d4da9d970cc996109b6d47ea092928ee36964e..e096cad84061c7ed28de36e3521ebb181a5acb90 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in 2.2.1
 
 * FIX: cnid_dbd: increase BerkeleyDB locks and lockobjs
 * FIX: afpd: increase BerkeleyDB locks and lockobjs
+* FIX: suse: initscript return better status
 
 Changes in 2.2
 ==============

diff --git a/config/Makefile.am b/config/Makefile.am
index 8fbfddebf416965b02241f71329d9c92e8fe1950..ce0fb96e2d3c02f02620a88f843082299a31d6c6 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -75,7 +75,7 @@ install-config-files: $(CONFFILES) $(GENFILES)
                fi; \
        done
 if USE_DEBIAN
-       $(mkinstalldirs) $(DESTDIR)/default
+       $(mkinstalldirs) $(DESTDIR)/etc/default
        if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f /etc/default/netatalk; then \
                echo "$(INSTALL_DATA) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk"; \
                $(INSTALL_DATA) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk; \

diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index d99d429e897db8d934cec31dd35086c540fc53a9..f392d51cfc5a6cd1480a0eb040227ab487a86f0b 100755 (executable)
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -110,14 +110,16 @@ case "$1" in
        ;;
     stop)
        echo -n "Shutting down netatalk"
-       killproc -TERM :SBINDIR:/papd
+       if test -x :SBINDIR:/papd ; then
+           killproc -TERM :SBINDIR:/papd
+       fi
        if test -x :SBINDIR:/timelord ; then
-         killproc -TERM :SBINDIR:/timelord
+           killproc -TERM :SBINDIR:/timelord
        fi
-       killproc -TERM :SBINDIR:/atalkd
-       if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
-           killproc -TERM :SBINDIR:/cnid_metad
+       if test -x :SBINDIR:/atalkd ; then
+           killproc -TERM :SBINDIR:/atalkd
        fi
+       killproc -TERM :SBINDIR:/cnid_metad
        killproc -TERM :SBINDIR:/afpd
 
        rc_status -v
@@ -129,18 +131,22 @@ case "$1" in
        ;;
     status)
        echo "Checking for netatalk services"
-       checkproc :SBINDIR:/papd && echo -n "papd: OK   " || echo -n "papd: No process  "
-       checkproc :SBINDIR:/afpd && echo -n " afpd: OK  " || echo -n " afpd: No process "
-       if test -x :SBINDIR:/timelord ; then
-         checkproc :SBINDIR:/timelord && echo -n " timelord: OK        " || echo -n " timelord: No process     "
+       if [ x"${ATALKD_RUN}" = x"yes" -a -x :SBINDIR:/atalkd ] ; then
+           checkproc :SBINDIR:/atalkd && echo -n "atalkd: OK   " || echo -n "atalkd: No process        "
        fi
-       if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
-           checkproc :SBINDIR:/cnid_metad && echo -n " cnid_metad: OK  " || echo -n " cnid_metad: No process"
+       if [ x"${PAPD_RUN}" = x"yes" -a -x :SBINDIR:/papd ] ; then
+           checkproc :SBINDIR:/papd && echo -n "papd: OK       " || echo -n "papd: No process  "
        fi
-checkproc :SBINDIR:/atalkd && echo "atalkd: OK" || echo "atalkd: No process"
-       # assume that atalkd is the "main" process ...
-       checkproc :SBINDIR:/atalkd
-       rc_status
+       if [ x"${TIMELORD_RUN}" = x"yes" -a -x :SBINDIR:/timelord ] ; then
+           checkproc :SBINDIR:/timelord && echo -n   " timelord: OK    " || echo -n " timelord: No process     "
+       fi
+       if [ x"${CNID_METAD_RUN}" = x"yes" ] ; then
+           checkproc :SBINDIR:/cnid_metad && echo -n " cnid_metad: OK  " || echo -n " cnid_metad: No process   "
+       fi
+       checkproc :SBINDIR:/afpd && echo "afpd: OK" || echo "afpd: No process"
+       # assume that afpd is the "main" process ...
+       checkproc :SBINDIR:/afpd
+       rc_status -v
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"

diff --git a/macros/summary.m4 b/macros/summary.m4
index 7673d4822589523e6eafb14e3d2050e02bf15b0c..7f567ca5800c6a727776b972ff4b9e2bd812b218 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -63,6 +63,7 @@ dnl   fi
        AC_MSG_RESULT([         force volume uid/gid:    $netatalk_cv_force_uidgid])
        AC_MSG_RESULT([         Apple 2 boot support:    $compile_a2boot])
        AC_MSG_RESULT([         ACL support:             $with_acl_support])
+       AC_MSG_RESULT([         LDAP support:            $with_ldap])
        if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])