Changeset 1352243


Ignore:
Timestamp:
04/30/15 09:45:40 (3 days ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.1.2
Children:
1c55bf4
Parents:
ecb34c4 (diff), e11be00 (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 'releng/10.1.2' of https://github.com/pcbsd/pcbsd into releng/10.1.2

Location:
src-sh
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/syscache/daemon/DB.cpp

    rd93ef62 rda42285  
    498498  else if(key.startsWith("Repos/")){ return remrun; } //remote sync running 
    499499  else if(key.startsWith("PBI/")){ return pbirun; } //pbi sync running 
    500   else if(key.startsWith("System/")){ return sysrun; } //system sync running 
     500  else if(key.startsWith("System/")){ return false; } //system sync running  
     501     //Note: Don't stop for system calls because freebsd-update can take *forever* to finish. 
     502     //  Let the system calls go through and get nothing, to let it proceed to other requests 
    501503  else{ return jrun; } 
    502504  //sysrun not used (yet) 
  • src-sh/pcbsd-utils/xtrafiles/local/share/pcbsd/conf/rc.conf.pcbsd

    reb5bd4f3 recb34c4  
    168168  # Support for iSCSI with Life-Preserver 
    169169  iscsid_enable="YES" 
    170  
    171   # Increase moused refresh rates / resolution for USB mice 
    172   moused_ums0_flags="-F 1000 -r 2000" 
    173170fi 
Note: See TracChangeset for help on using the changeset viewer.