Changeset 332d968


Ignore:
Timestamp:
11/14/13 07:30:22 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
a6c8b4a
Parents:
d208e877
Message:

Backport the SWAP fix to 9.2

File:
1 edited

Legend:

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

    r767280f r332d968  
    396396        if ( copyList.at(i).at(0) == workingDisk \ 
    397397          && copyList.at(i).at(1) == workingSlice \ 
    398           && (mounts.at(z) == startPart || mounts.at(z).contains(startPart + "(") ) ) { 
    399  
     398          && (mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) { 
    400399          // Check if we have any extra arguments to throw on the end 
    401400          XtraTmp=""; 
     
    413412            for (int ds = 0; ds < zDS.size(); ++ds) { 
    414413              //if ( zDS.at(ds) != "/" ) 
    415                // zDS.replace(ds, "/" + zDS.at(ds)); 
     414              // zDS.replace(ds, "/" + zDS.at(ds)); 
    416415              if ( zDS.at(ds).indexOf("(") != -1 ) { 
    417416                zTMP = zDS.at(ds); 
     
    590589        while (!in.atEnd()) { 
    591590           QString line = in.readLine(); 
    592            if ( line.indexOf('LoadModule: "nvidia"') != -1 ) { 
     591           if ( line.indexOf("NVIDIA") != -1 ) { 
    593592             selectedPkgs << "NVIDIA"; 
    594593             break; 
     
    11371136        if ( copyList.at(i).at(0) == workingDisk \ 
    11381137          && copyList.at(i).at(1) == workingSlice \ 
    1139           && mounts.at(z) == startPart ) { 
     1138          && ( mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) { 
    11401139 
    11411140          // Check if we have any extra arguments to throw on the end 
Note: See TracChangeset for help on using the changeset viewer.