Changeset 362a0b6


Ignore:
Timestamp:
08/05/13 06:52:57 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
af47272
Parents:
8f0462a (diff), 9f211e3 (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
  • build-files/conf/port-make.conf

    r6c2cb18 rb208a42c  
    9494 
    9595virtualbox_SET=VNC WEBSERVICE 
    96 nginx_SET=HTTP_FLV 
     96 
     97# Options requested by FreeNAS 
     98nginx_SET=HTTP_FLV HTTP_SSL PASSENGER 
     99redmine_SET=POSTGRESQL PASSENGER 
     100rubygem-passenger=NGINX 
     101rubygem-rails=FCGI PASSENGER 
     102rubygem-activerecord=PGSQL SQLITE3 
    97103 
    98104# Configuration for www/bigbluebutton 
  • overlays/install-overlay/etc/pcbsd-video.sh

    r1620346 r9f211e3  
    4242fi 
    4343 
     44loadIntelKMS=no 
     45 
    4446# Check for optimus with intel as first card 
    4547echo "$card1" | grep -q -i -e "intel" 
     
    5052      sleep 1 
    5153   fi 
     54   loadIntelKMS=yes 
    5255fi 
    5356 
     
    5962      echo "Detected Optimus! Using intel video..." 
    6063      sleep 1 
     64      loadIntelKMS=yes 
    6165   else 
    6266      echo "Detected NVIDIA! Loading NVIDIA driver..." 
     
    6569   fi 
    6670fi 
     71 
     72# If we are running an intel chipset, load the newer KMS driver automatically 
     73if [ "$loadIntelKMS" = "yes" ] ; then 
     74   kldload i915kms 
     75fi 
  • src-qt4/pc-mounttray/mountTray.cpp

    rfd5dfb8 r8f0462a  
    193193  QStringList nsd = DCheck->devChildren(""); 
    194194  //Remove all the currently managed devices 
    195   for(int i=0; i<deviceList.length(); i++){ 
    196     QString dev = deviceList[i]->device; 
     195  qDebug() << "Current Device List:" << nsd; 
     196  for(int i=0; i<deviceList.length(); i++){ 
     197    QString dev = deviceList[i]->device.section("/",-1); 
     198    qDebug() << " - Check device:" << dev; 
    197199    int ni = nsd.indexOf(dev); 
    198200    if(ni == -1){ 
    199201      //Device Removed 
     202      qDebug() << " - Device no longer connected"; 
    200203      removeDevice(dev); 
    201204      i--; 
     
    205208        QString ja, jb, jc, jd; //junk variables 
    206209        if( !DCheck->devInfo(dev,&ja,&jb,&jc,&jd) ){ 
     210          qDebug() << " - Device no longer valid"; 
    207211          //no longer valid device 
    208212          removeDevice(dev); 
Note: See TracChangeset for help on using the changeset viewer.