Changeset 8dc88d5


Ignore:
Timestamp:
05/12/14 06:44:58 (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
f3aa4ee
Parents:
f6cf020
Message:

Fix zfs property suid -> setuid

Location:
src-qt4/pc-installgui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    r0a68a6a r8dc88d5  
    287287    // Add the main zfs pool with standard partitions 
    288288    fsType= "ZFS"; 
    289     fileSystem << targetDisk << targetSlice << "/(compress=lz4),/tmp(compress=lz4|exec=off|suid=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|suid=off),/var/tmp(compress=lz4|exec=off|suid=off)" << fsType << tmp.setNum(totalSize) << "" << ""; 
     289    fileSystem << targetDisk << targetSlice << "/(compress=lz4),/tmp(compress=lz4|exec=off|setuid=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|setuid=off),/var/tmp(compress=lz4|exec=off|setuid=off)" << fsType << tmp.setNum(totalSize) << "" << ""; 
    290290    sysFinalDiskLayout << fileSystem; 
    291291    fileSystem.clear(); 
  • src-qt4/pc-installgui/wizardDisk.cpp

    r37284b29 r8dc88d5  
    426426 
    427427     // This lets the user do nifty stuff like a mirror/raid post-install with a single zpool command 
    428     fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4|suid=off|exec=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|suid=off),/var/tmp(compress=lz4|exec=off|suid=off)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
     428    fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4|setuid=off|exec=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|setuid=off),/var/tmp(compress=lz4|exec=off|setuid=off)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
    429429    sysFinalDiskLayout << fileSystem; 
    430430    fileSystem.clear(); 
     
    708708  popupNE->addAction( "off", this, SLOT(slotZEXOFF())); 
    709709 
    710   // Add suid sub-menu 
    711   popupNE = popup->addMenu("suid"); 
     710  // Add setuid sub-menu 
     711  popupNE = popup->addMenu("setuid"); 
    712712  popupNE->addAction( "on", this, SLOT(slotZSUIDON())); 
    713713  popupNE->addAction( "off", this, SLOT(slotZSUIDOFF())); 
     
    819819void wizardDisk::slotZSUIDOFF() 
    820820{ 
    821   toggleZFSOpt(QString("suid=off")); 
     821  toggleZFSOpt(QString("setuid=off")); 
    822822} 
    823823 
    824824void wizardDisk::slotZSUIDON() 
    825825{ 
    826   toggleZFSOpt(QString("suid=on")); 
     826  toggleZFSOpt(QString("setuid=on")); 
    827827} 
    828828 
Note: See TracChangeset for help on using the changeset viewer.