Changeset 534c70e


Ignore:
Timestamp:
12/27/13 11:58:29 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
4f9718b, b34565c
Parents:
c930de6 (diff), 1140d1b (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:
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-controlpanel/items/system/pc-dmconf.desktop

    r43594c6 r5a94cb0  
    44Comment= 
    55Exec=pc-su pc-dmconf 
    6 TryExec=pc-dmconf 
    76Keywords="gdm,login,login window,auto login,autologin,xdmcp,remote login,login timout" 
    87Icon=/usr/local/share/pcbsd/icons/pc-dmconf.png 
  • src-sh/pbi-manager/pbi-manager

    r93e558b r1140d1b  
    61966196  # We have something to build lets do it! 
    61976197  pbi="$CUR_WORKING_PBI" 
    6198   unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION PBI_AB_NOPKGBUILD 
     6198  unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION PBI_AB_NOPKGBUILD PBI_PKGNGBUILD 
    61996199  . ${pbi} 
    62006200 
     
    72107210 
    72117211                # Install pkgng into the chroot 
    7212                 pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg 
    7213                 if [ $? -ne 0 ] ; then 
    7214                         exit_err "Failed installing pkgng into chroot" 
    7215                 fi 
     7212                # This can fail when we run multiple builders at once, 
     7213                # due to the pkgng DB being locked :( 
     7214 
     7215                # For now try multiple times, this should be revisited with 
     7216                # a cleaner solution at some point 
     7217                tries=0 
     7218                while : 
     7219                do 
     7220                        pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg 
     7221                        if [ $? -eq 0 ] ; then break ; fi 
     7222 
     7223                        if [ $tries -gt 10 ] ; then 
     7224                                exit_err "Failed installing pkgng into chroot" 
     7225                        else 
     7226                                echo "Pkgng is busy, trying again in 8 seconds" 
     7227                                sleep 8 
     7228                                tries=`tries expr + 1` 
     7229                        fi 
     7230                done 
    72167231 
    72177232        fi 
  • src-sh/pc-installdialog/pc-installdialog.sh

    r26e5e91 r2c17937  
    2121ZPROPS="aclinherit(discard|noallow|restricted|passthrough|passthrough-x),aclmode(discard|groupmask|passthrough|restricted),atime(on|off),canmount(on|off|noauto),checksum(on|off|fletcher2|fletcher4|sha256),compress(on|off|lzjb|gzip|zle|lz4),copies(1|2|3),dedup(on|off|verify|sha256),exec(on|off),primarycache(all|none|metadata),readonly(on|off),secondarycache(all|none|metadata),setuid(on|off),sharenfs(on|off),logbias(latency|throughput),snapdir(hidden|visible),sync(standard|always|disabled),jailed(off|on)" 
    2222 
    23 PCSYS="/usr/local/sbin/pc-sysinstall" 
     23PCSYS="/root/pc-sysinstall/pc-sysinstall" 
    2424 
    2525# The current ZPOOL type should default to single 
  • src-sh/pc-sysinstall/backend/functions-bsdlabel.sh

    r87e7f725 r8364326  
    414414        sleep 2 
    415415        # MBR type 
    416         aCmd="gpart add -a 4k ${SOUT} -t ${PARTYPE} -i ${CURPART} ${_wSlice}" 
     416        aCmd="gpart add ${SOUT} -t ${PARTYPE} -i ${CURPART} ${_wSlice}" 
    417417      fi 
    418418 
  • src-qt4/pc-mounttray/devCheck.cpp

    re020f6a rc930de6  
    4141  devDir.cd(DEVICEDIR); 
    4242  QStringList subdevs; 
    43   if(node.isEmpty()){ 
     43  //if(node.isEmpty()){ 
    4444    subdevs = devDir.entryList(devFilter, QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    45   }else{ 
    46     subdevs = devDir.entryList(QStringList(node+"*"), QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    47   } 
     45  //}else{ 
     46    //subdevs = devDir.entryList(QStringList(node+"*"), QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
     47  //} 
    4848  //Clean up the list of children 
    4949  for(int i=0; i<subdevs.length(); i++){ 
    50     if( (subdevs[i] == node) || subdevs[i].isEmpty() ){ 
     50    if( (subdevs[i] == node) || subdevs[i].isEmpty() || !subdevs[i].startsWith(node) ){ 
    5151      subdevs.removeAt(i); 
    5252      i--; 
    5353    } 
    5454  } 
     55  qDebug() << "[DEBUG] " <<node << "Device Children:" << subdevs; 
    5556  return subdevs; 
    5657} 
Note: See TracChangeset for help on using the changeset viewer.