Changeset 01c8e13


Ignore:
Timestamp:
Nov 7, 2013 8:06:52 AM (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
6abb585
Parents:
0e213ad (diff), 6716587 (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 '9.2-release' of github.com:pcbsd/pcbsd into 9.2-release

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/misc/pcbsd-meta-gnome/Makefile

    r519cffe ra8c6b3a  
    2828                seahorse>=0:${PORTSDIR}/security/seahorse \ 
    2929                seahorse-plugins>=0:${PORTSDIR}/security/seahorse-plugins \ 
    30                 py27-gtk>=0:${PORTSDIR}/x11-toolkits/py-gtk2 \ 
    3130                gtk2-qtcurve-theme>=0:${PORTSDIR}/x11-themes/qtcurve-gtk2 \ 
    3231                nimbus>=0:${PORTSDIR}/x11-themes/nimbus \ 
  • src-sh/warden/scripts/backend/checkstatus.sh

    r1620346 r6716587  
    3737# Check if anything is still mounted in this jail 
    3838hasmount="0" 
    39 for mountpoint in $(mount | grep -e '${JAILDIR}/' | cut -d" " -f3); do 
     39for mountpoint in $(mount | grep -e "${JAILDIR}/" | cut -d" " -f3); do 
    4040  hasmount="1" 
    4141done 
    4242 
    4343# Check if the jail is active 
    44 jls | grep ${JAILNAME}$ >/dev/null 2>/dev/null 
     44jls | grep "${JAILDIR}$" >/dev/null 2>/dev/null 
    4545if [ "$?" = "0" -o "$hasmount" = "1" ]; then 
    4646  exit 0 
  • src-qt4/pc-installgui/installer.cpp

    r07eb74c r0e213ad  
    258258    return false; 
    259259 
     260  // If over 1.99TB, we should use GPT mode 
     261  if ( totalSize > 1999900 ) 
     262    loadGPT=true; 
    260263 
    261264  // If on amd64 lets use ZFS, it rox 
Note: See TracChangeset for help on using the changeset viewer.