[PC-BSD Commits] r2276 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2008-07-03 14:50:09 -0700 (Thu, 03 Jul 2008)
New Revision: 2276

Modified:
   pcbsd/trunk/PCInstall/pcinstall.cpp
Log:

Fixed a few logic problems with pcinstall.cpp, only run setup scripts after
all CD's have been installed, not between CD1 & CD2, this fixes some problems
with config files not being modified properly



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-07-03 18:17:15 UTC (rev 2275)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-07-03 21:50:09 UTC (rev 2276)
@@ -1543,7 +1543,7 @@
         tr("An error occured while extracting the system image! Please check the install CD, or try selecting 'Safe Mode' \nwhen the installation CD begins booting. The system will now reboot.") );
 	    exit(1);
      } else {
-	 setupUsersSlot();
+         slotStartMountCD2();
      }
 }
 
@@ -1919,8 +1919,8 @@
 	 
 	 TimeProc->addArgument(tmp);
 	 
-	  // Conect to the slot to start installing CD2
-                 connect( TimeProc, SIGNAL(processExited()), this, SLOT(slotStartMountCD2() ) );
+	  // Conect to the slot to finish up the install
+          connect( TimeProc, SIGNAL(processExited()), this, SLOT(slotRunLastScripts() ) );
 
 	 
 
@@ -3220,7 +3220,8 @@
 	  // If no extra components, then lets finish up the install
 	if ( radioFreshInstall->isChecked() )
 	{
-	   slotRunLastScripts();
+            // Run our setup scripts now, starting with the user add slot
+            setupUsersSlot();
 	} else {
 	    slotRunFinalScriptUpgrade();
 	} 
@@ -3312,7 +3313,8 @@
        // All ready to finish up the install, check the type of install we were doing, and finish it now
       if ( radioFreshInstall->isChecked() )
       {
-           slotRunLastScripts();
+            // Setup our users and run final scripts now
+            setupUsersSlot();
       } else {
            slotRunFinalScriptUpgrade();
      }