1 files changed, 12 insertions, 3 deletions
diff --git a/ldap/admin/src/scripts/DSMigration.pm.in b/ldap/admin/src/scripts/DSMigration.pm.in
index fd8ac04d..089f4121 100644
--- a/ldap/admin/src/scripts/DSMigration.pm.in
+++ b/ldap/admin/src/scripts/DSMigration.pm.in
@@ -743,9 +743,9 @@ sub migrateDS {
             return 0;
         }
 
-        if (!$mig->{start_servers}) {
-            $inf->{slapd}->{start_server} = 0;
-        }
+        # create servers but do not start them until after databases
+        # have been migrated
+        $inf->{slapd}->{start_server} = 0;
 
         # create the new instance
         @errs = createDSInstance($inf);
@@ -768,6 +768,15 @@ sub migrateDS {
             $mig->msg(@errs);
             return 0;
         }
+
+        # finally, start the server
+        if ($mig->{start_servers}) {
+            $inf->{slapd}->{start_server} = 1;
+            if (@errs = DSCreate::startServer($inf)) {
+                $mig->msg(@errs);
+                return 0;
+            }
+        }
     }
 
     return 1;