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

svn at pcbsd.org svn at pcbsd.org
Tue Jul 22 14:13:19 PDT 2008


Author: kris
Date: 2008-07-22 14:13:19 -0700 (Tue, 22 Jul 2008)
New Revision: 2418

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

Fixed slice generation with ZFS support



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-07-22 20:32:15 UTC (rev 2417)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-07-22 21:13:19 UTC (rev 2418)
@@ -321,6 +321,15 @@
   
     if ( Page == tr("Installing PC-BSD") )
     {
+        // Check if we needed to regen the slices for ZFS
+        if ( regenCustomSlices == 1) {
+	   // Setup the initial slice layout
+	   setupInitialSlices();
+	   regenCustomSlices = 0;
+	   populateSlices();
+        }
+
+
 	setBackEnabled(currentPage(), FALSE);
 	setNextEnabled(currentPage(), FALSE);
 	
@@ -1099,7 +1108,7 @@
     QString PartLetter;
     
     // Use a custom disk label if the user selected it, or if we are using ZFS since we need a seperate /boot filesystem
-    if ( checkCustomPartition->isChecked() && checkCustomDiskSlice->isChecked() || comboFileSystem->currentItem() == 3 )
+     if ( (checkCustomPartition->isChecked() && checkCustomDiskSlice->isChecked()) || comboFileSystem->currentItem() == 3 )
     {
 	    QFile file( "/tmp/BSDLabel" );
 	    if ( file.open( IO_WriteOnly ) ) {
@@ -1178,7 +1187,7 @@
 	    WriteBSDLab->addArgument( "/tmp/BSDLabel" ); 
                     
 	    connect( WriteBSDLab, SIGNAL(processExited()), this, SLOT(RunNewfsSlot() ) );
-
+	   // QMessageBox::warning( this, "PCBSD Installer",  "running bsdlabel", "Retry", "Quit", 0, 0, 1 );
 	    if ( !WriteBSDLab->start() ) {
 //
 	    }
@@ -1190,7 +1199,7 @@
 void PCInstall::RunNewfsSlot()
 {
     QString tmp;
- //     QMessageBox::warning( this, "PCBSD Installer",  "running newfs", "Retry", "Quit", 0, 0, 1 );
+     // QMessageBox::warning( this, "PCBSD Installer",  "running newfs", "Retry", "Quit", 0, 0, 1 );
     
        textFileProgress->setText(tr("Running newfs on ") + RootPartition);
        installProgress->setProgress(4);



More information about the Commits mailing list