Changeset 767280f


Ignore:
Timestamp:
Nov 12, 2013 1:53:06 PM (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
2a412cf, 4f9718b
Parents:
459a4a5
Message:

Fix detection of the NVIDIA driver during installation, /etc/X11/xorg.conf no longer always exists

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    r63e2edc r767280f  
    584584 
    585585      // Check if we are using NVIDIA driver and include it automatically 
    586       QFile file("/etc/X11/xorg.conf"); 
     586      QFile file("/var/log/Xorg.0.log"); 
    587587      if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { 
    588588           
     
    590590        while (!in.atEnd()) { 
    591591           QString line = in.readLine(); 
    592            if ( line.indexOf("nvidia") != -1 ) { 
     592           if ( line.indexOf('LoadModule: "nvidia"') != -1 ) { 
    593593             selectedPkgs << "NVIDIA"; 
    594594             break; 
Note: See TracChangeset for help on using the changeset viewer.