Changeset 47914d6


Ignore:
Timestamp:
09/08/14 07:00:29 (2 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master
Children:
a7ad344, cba716c
Parents:
0b8a7480 (diff), c18fdaf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
3 edited

Legend:

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

    r0933dea rc18fdaf  
    286286  // Add the main zfs pool with standard partitions 
    287287  fsType= "ZFS"; 
    288   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) << "" << ""; 
     288  fileSystem << targetDisk << targetSlice << "/(compress=lz4|atime=off),/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) << "" << ""; 
    289289  sysFinalDiskLayout << fileSystem; 
    290290  fileSystem.clear(); 
  • src-sh/syscache/client/main.cpp

    r5ce6eea r0b8a7480  
    136136\n\ 
    137137Usage:\n\ 
     138  syscache startsync -> Manually start a system information sync (usually unnecessary) \n\ 
    138139  syscache \"<DB request 1>\" \"<DB request 2>\" [etc] \n\ 
    139140  syscache help [jail | pkg | pbi] -> Information about DB requests for that subsystem \n\ 
  • src-sh/syscache/daemon/DB.cpp

    r71fe9e9 r0b8a7480  
    8282  //Determine the internal hash key for the particular request 
    8383  if(request.length()==1){ 
    84            
     84    if(request[0]=="startsync"){ kickoffSync(); return "Starting Sync..."; } 
    8585  }else if(request.length()==2){ 
    8686    if(request[0]=="jail"){ 
Note: See TracChangeset for help on using the changeset viewer.