Changeset c43f7c2


Ignore:
Timestamp:
01/24/14 08:07:05 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
afd29e5, 18c6ea0
Parents:
4bd5e88 (diff), c967025 (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

    r9247fd7 rc967025  
    275275    // Add the main zfs pool with standard partitions 
    276276    fsType= "ZFS"; 
    277     fileSystem << targetDisk << targetSlice << "/,/tmp(compress=lz4),/usr(canmount=off),/usr/home,/usr/jails,/usr/obj(compress=lz4),/usr/pbi,/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4),/var/tmp(compress=lz4)" << fsType << tmp.setNum(totalSize) << "" << ""; 
     277    fileSystem << targetDisk << targetSlice << "/,/tmp(compress=lz4),/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),/var/tmp(compress=lz4)" << fsType << tmp.setNum(totalSize) << "" << ""; 
    278278    sysFinalDiskLayout << fileSystem; 
    279279    fileSystem.clear(); 
  • src-sh/pc-installdialog/pc-installdialog.sh

    r2c17937 rc967025  
    1616 
    1717# Default ZFS layout 
    18 ZFSLAYOUT="/,/root,/tmp(compress=lz4),/usr(canmount=off),/usr/home,/usr/jails,/usr/obj(compress=lz4),/usr/pbi,/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4),/var/tmp(compress=lz4)" 
     18ZFSLAYOUT="/,/root(compress=lz4),/tmp(compress=lz4),/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),/var/tmp(compress=lz4)" 
    1919 
    2020# Ugly master list of settable ZFS properties 
  • src-qt4/xtrafiles/local/share/pcbsd/xstartup/enable-ibus.sh

    r1620346 r4bd5e88  
    1515 
    1616# Check if this lang needs ibus 
    17 case ${GDM_LANG} in 
     17case ${LANG} in 
    1818  ja_JP*) 
    1919  ibus_initialize "anthy" 
Note: See TracChangeset for help on using the changeset viewer.