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