WIP573889

1 files changed, 9 insertions, 1 deletions

diff --git a/ldap/admin/src/scripts/DSMigration.pm.in b/ldap/admin/src/scripts/DSMigration.pm.in
index 38407ba2..53e06303 100644
--- a/ldap/admin/src/scripts/DSMigration.pm.in
+++ b/ldap/admin/src/scripts/DSMigration.pm.in
@@ -1042,6 +1042,13 @@ sub migrateDSInstance {
         return @errs;
     }
 
+    my $setup = new Setup($mig->{res});
+    $setup->{update} = 1;
+
+    if (@errs = updateDS($setup)) {
+        return @errs;
+    }
+
     # next, the databases
     if (@errs = migrateDatabases($mig, $inst, $src, $dest)) {
         return @errs;
@@ -1079,6 +1086,7 @@ sub migrateDS {
 
     # for each instance
     foreach my $inst (@{$mig->{instances}}) {
+print "Migrating $inst.\n";
         if (-f "$mig->{configdir}/$inst/dse.ldif") {
             $mig->msg($WARN, 'instance_already_exists', "$mig->{configdir}/$inst/dse.ldif");
             next;
@@ -1095,7 +1103,7 @@ sub migrateDS {
         # instance on the dest
 
         # extract the information needed for ds_newinst.pl
-        my $oldconfigdir = "$mig->{oldsroot}/$inst/config";
+        my $oldconfigdir = "$mig->{oldsroot}/$inst";
         my $inf = createInfFromConfig($oldconfigdir, $inst, \@errs);
         if (@errs) {
             $mig->msg(@errs);