[PC-BSD Commits] r15447 - users/kris/pc-installgui

svn at pcbsd.org svn at pcbsd.org
Thu Feb 16 12:12:45 PST 2012


Author: kris
Date: 2012-02-16 20:12:45 +0000 (Thu, 16 Feb 2012)
New Revision: 15447

Modified:
   users/kris/pc-installgui/installer.cpp
   users/kris/pc-installgui/wizardDisk.cpp
Log:

Use the correct zfs options when building a config file, pc-sysinstall will 
support these now



Modified: users/kris/pc-installgui/installer.cpp
===================================================================
--- users/kris/pc-installgui/installer.cpp	2012-02-16 20:11:58 UTC (rev 15446)
+++ users/kris/pc-installgui/installer.cpp	2012-02-16 20:12:45 UTC (rev 15447)
@@ -228,7 +228,7 @@
      } else {
        // Add the main zfs pool with standard partitions
        fsType= "ZFS";
-       fileSystem << targetDisk << targetSlice << "/,/swap(swap),/var,/usr,/usr/ports(compress),/usr/src(compress),/tmp" << fsType << tmp.setNum(totalSize) << "" << "";
+       fileSystem << targetDisk << targetSlice << "/,/swap(volsize=2G|org.freebsd:swap=on|checksum=off),/var,/usr,/usr/ports(compression=on),/usr/src(compression=on),/tmp" << fsType << tmp.setNum(totalSize) << "" << "";
        //qDebug() << "Auto-Gen FS:" <<  fileSystem;
        sysFinalDiskLayout << fileSystem;
        fileSystem.clear();

Modified: users/kris/pc-installgui/wizardDisk.cpp
===================================================================
--- users/kris/pc-installgui/wizardDisk.cpp	2012-02-16 20:11:58 UTC (rev 15446)
+++ users/kris/pc-installgui/wizardDisk.cpp	2012-02-16 20:12:45 UTC (rev 15447)
@@ -314,7 +314,7 @@
 
        // Add the main zfs pool with standard partitions including a /swap on ZFS
        // This lets the user do nifty stuff like a mirror/raid post-install with a single zpool command
-       fileSystem << targetDisk << targetSlice << "/,/swap(swap),/var,/usr,/usr/ports(compress),/usr/src(compress),/tmp" << fsType << tmp.setNum(totalSize) << "" << tmpPass;
+       fileSystem << targetDisk << targetSlice << "/,/swap(volsize=2G|org.freebsd:swap=on|checksum=off),/var,/usr,/usr/ports(compression=on),/usr/src(compression=on),/tmp" << fsType << tmp.setNum(totalSize) << "" << tmpPass;
        //qDebug() << "Auto-Gen FS:" <<  fileSystem;
        sysFinalDiskLayout << fileSystem;
        fileSystem.clear();
@@ -597,19 +597,19 @@
       return;
 
     QString zCmp, zNoChk, zNoA, zNoExe;
-    if ( treeMounts->currentItem()->text(2).indexOf("compress") != -1 )
+    if ( treeMounts->currentItem()->text(2).indexOf("compression=on") != -1 )
       zCmp=tr("Disable compression");
     else
       zCmp=tr("Enable compression");
-    if ( treeMounts->currentItem()->text(2).indexOf("nochecksum") != -1 )
+    if ( treeMounts->currentItem()->text(2).indexOf("checksum=off") != -1 )
       zNoChk=tr("Enable checksum");
     else
       zNoChk=tr("Disable checksum");
-    if ( treeMounts->currentItem()->text(2).indexOf("noatime") != -1 )
+    if ( treeMounts->currentItem()->text(2).indexOf("atime=off") != -1 )
       zNoA=tr("Enable atime");
     else
       zNoA=tr("Disable atime");
-    if ( treeMounts->currentItem()->text(2).indexOf("noexec") != -1 )
+    if ( treeMounts->currentItem()->text(2).indexOf("exec=off") != -1 )
       zNoExe=tr("Enable exec");
     else
       zNoExe=tr("Disable exec");
@@ -625,22 +625,22 @@
 
 void wizardDisk::slotZCmp()
 {
-  toggleZFSOpt(QString("compress"));
+  toggleZFSOpt(QString("compression=on"));
 }
 
 void wizardDisk::slotZChk()
 {
-  toggleZFSOpt(QString("nochecksum"));
+  toggleZFSOpt(QString("checksum=off"));
 }
 
 void wizardDisk::slotZAtime()
 {
-  toggleZFSOpt(QString("noatime"));
+  toggleZFSOpt(QString("atime=off"));
 }
 
 void wizardDisk::slotZExec()
 {
-  toggleZFSOpt(QString("noexec"));
+  toggleZFSOpt(QString("exec=off"));
 }
 
 // Toggle an option being on / off for ZFS



More information about the Commits mailing list