[PC-BSD Commits] r6449 - pcbsd/trunk/SysInstaller

svn at pcbsd.org svn at pcbsd.org
Fri Mar 26 12:03:17 PDT 2010


Author: kris
Date: 2010-03-26 12:03:17 -0700 (Fri, 26 Mar 2010)
New Revision: 6449

Modified:
   pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
Log:

Fixed a segment fault in SysInstaller which was causing a reboot



Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-26 18:52:13 UTC (rev 6448)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2010-03-26 19:03:17 UTC (rev 6449)
@@ -265,7 +265,7 @@
         mntsize = 2048;
      else
         mntsize = 512;
-     fileSystem << targetDisk << targetSlice << "/" << "UFS+S" << tmp.setNum(mntsize);
+     fileSystem << targetDisk << targetSlice << "/" << "UFS+S" << tmp.setNum(mntsize) << "" << "";
      totalSize = totalSize - mntsize;
      qDebug() << "Auto-Gen FS:" <<  fileSystem;
      sysFinalDiskLayout << fileSystem;
@@ -276,7 +276,7 @@
      mntsize = systemMemory * 2;
      if ( totalSize - mntsize < 3000 )
         mntsize = 512;
-     fileSystem << targetDisk << targetSlice << "SWAP" << "SWAP" << tmp.setNum(mntsize);
+     fileSystem << targetDisk << targetSlice << "SWAP" << "SWAP" << tmp.setNum(mntsize) << "" << "";
      totalSize = totalSize - mntsize;
      qDebug() << "Auto-Gen FS:" <<  fileSystem;
      sysFinalDiskLayout << fileSystem;
@@ -285,7 +285,7 @@
 
      // Figure out the default size for /var if we are on FreeBSD / PC-BSD
      mntsize = 1024;
-     fileSystem << targetDisk << targetSlice << "/var" << "UFS+S" << tmp.setNum(mntsize);
+     fileSystem << targetDisk << targetSlice << "/var" << "UFS+S" << tmp.setNum(mntsize) << "" << "";
      totalSize = totalSize - mntsize;
      qDebug() << "Auto-Gen FS:" <<  fileSystem;
      sysFinalDiskLayout << fileSystem;
@@ -293,7 +293,7 @@
 
 
      // Now use the rest of the disk / slice for /usr
-     fileSystem << targetDisk << targetSlice << "/usr" << "UFS+S" << tmp.setNum(totalSize);
+     fileSystem << targetDisk << targetSlice << "/usr" << "UFS+S" << tmp.setNum(totalSize) << "" << "";
      qDebug() << "Auto-Gen FS:" <<  fileSystem;
      sysFinalDiskLayout << fileSystem;
      fileSystem.clear();



More information about the Commits mailing list