From 2e24332235713cc59d33e134f6e77e270fb055676ea21b0092841fe2411932b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Sat, 15 Aug 2020 06:44:31 +0000 Subject: [PATCH] Accepting request 826780 from home:kukuk:container - Remove remaining rc.status usage in start script OBS-URL: https://build.opensuse.org/request/show/826780 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=267 --- openldap2.changes | 5 +++++ start | 18 +----------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/openldap2.changes b/openldap2.changes index 755522f..7319993 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 15 06:36:43 UTC 2020 - Thorsten Kukuk + +- Remove remaining rc.status usage in start script + ------------------------------------------------------------------- Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder diff --git a/start b/start index e4aaf0e..b6318ff 100644 --- a/start +++ b/start @@ -34,20 +34,6 @@ SLAPD_PID_DIR="/var/run/slapd/" test -x $SLAPD_BIN || exit 5 -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_failed set local and overall rc status to -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -. /etc/rc.status - -# First reset status of this service -rc_reset - function init_ldap_listener_urls(){ case "$OPENLDAP_START_LDAP" in [Yy][Ee][Ss]) @@ -143,14 +129,12 @@ GROUP_CMD="" if [ -f /etc/openldap/UPDATE_NEEDED ]; then - rc_failed 6 echo " The configuration of your LDAP server needs to be updated." echo " Please see /usr/share/doc/packages/openldap2/README.update" echo " for details." echo " After the update please remove the file:" echo " /etc/openldap/UPDATE_NEEDED" - rc_status -v - exit + exit 6 fi # chown backend directories if OPENLDAP_CHOWN_DIRS ist set if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then