[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts DSMigration.pm.in, 1.12, 1.13

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6434

Modified Files:
	DSMigration.pm.in 
Log Message:
Resolves: bug 288451
Description: Show-Stopper - Migration from HP-PARISC DS 6.21 to DS80 on HP-Itaninum
Fix Description: Cannot start servers until after the data and config has been migrated.



Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DSMigration.pm.in	14 Sep 2007 02:41:13 -0000	1.12
+++ DSMigration.pm.in	14 Sep 2007 16:26:17 -0000	1.13
@@ -743,9 +743,9 @@
             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 @@
             $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;