From 2b5b09a7a871d626bb45888f948126732d0893f3 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Wed, 4 Oct 2017 12:55:30 -0400 Subject: [PATCH] Ticket 49038 - remove legacy replication - change cleanup script precedence Description: Bump the cleanup scripts precendance so it happens after the main plugin upgrade scripts are called. https://pagure.io/389-ds-base/issue/49038 Reviewed by: firstyear(Thanks!) (cherry picked from commit 1fe2c761103c36090ab67df0271dfdb3012037fb) --- Makefile.am | 2 +- ...{50removeLegacyReplication.ldif => 60removeLegacyReplication.ldif} | 0 rpm/389-ds-base.spec.in | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename ldap/admin/src/scripts/{50removeLegacyReplication.ldif => 60removeLegacyReplication.ldif} (100%) diff --git a/Makefile.am b/Makefile.am index 09a6bc296..8834a7819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -942,7 +942,7 @@ update_DATA = ldap/admin/src/scripts/exampleupdate.pl \ ldap/admin/src/scripts/50telexnumbersyntaxplugin.ldif \ ldap/admin/src/scripts/50guidesyntaxplugin.ldif \ ldap/admin/src/scripts/50targetuniqueid.ldif \ - ldap/admin/src/scripts/50removeLegacyReplication.ldif \ + ldap/admin/src/scripts/60removeLegacyReplication.ldif \ ldap/admin/src/scripts/50linkedattrsplugin.ldif \ ldap/admin/src/scripts/50usnplugin.ldif \ ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif \ diff --git a/ldap/admin/src/scripts/50removeLegacyReplication.ldif b/ldap/admin/src/scripts/60removeLegacyReplication.ldif similarity index 100% rename from ldap/admin/src/scripts/50removeLegacyReplication.ldif rename to ldap/admin/src/scripts/60removeLegacyReplication.ldif diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 1e5c2cfd3..30a1d7d9a 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -395,9 +395,9 @@ echo remove pid files . . . >> $output 2>&1 || : echo upgrading instances . . . >> $output 2>&1 || : DEBUGPOSTSETUPOPT=`/usr/bin/echo $DEBUGPOSTSETUP | /usr/bin/sed -e "s/[^d]//g"` if [ -n "$DEBUGPOSTSETUPOPT" ] ; then - %{_sbindir}/setup-ds.pl -l $output2 -$DEBUGPOSTSETUPOPT -u -s General.UpdateMode=offline >> $output 2>&1 || : + %{_sbindir}/setup-ds.pl -$DEBUGPOSTSETUPOPT -u -s General.UpdateMode=offline >> $output 2>&1 || : else - %{_sbindir}/setup-ds.pl -l $output2 -u -s General.UpdateMode=offline >> $output 2>&1 || : + %{_sbindir}/setup-ds.pl -u -s General.UpdateMode=offline >> $output 2>&1 || : fi # restart instances that require it -- 2.13.6