Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Backport the SWAP fix to 9.2

  • Loading branch information...
commit 332d9689b516c718ec821fca24f9ed5cabb5cb50 1 parent d208e87
@kmoore134 kmoore134 authored
Showing with 4 additions and 5 deletions.
  1. +4 −5 src-qt4/pc-installgui/installer.cpp
View
9 src-qt4/pc-installgui/installer.cpp
@@ -395,8 +395,7 @@ QStringList Installer::getDiskSummary()
for (int z = 0; z < mounts.size(); ++z) {
if ( copyList.at(i).at(0) == workingDisk \
&& copyList.at(i).at(1) == workingSlice \
- && (mounts.at(z) == startPart || mounts.at(z).contains(startPart + "(") ) ) {
-
+ && (mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) {
// Check if we have any extra arguments to throw on the end
XtraTmp="";
if ( ! copyList.at(i).at(5).isEmpty() )
@@ -412,7 +411,7 @@ QStringList Installer::getDiskSummary()
QString zTMP;
for (int ds = 0; ds < zDS.size(); ++ds) {
//if ( zDS.at(ds) != "/" )
- // zDS.replace(ds, "/" + zDS.at(ds));
+ // zDS.replace(ds, "/" + zDS.at(ds));
if ( zDS.at(ds).indexOf("(") != -1 ) {
zTMP = zDS.at(ds);
zTMP.replace("(", " (");
@@ -589,7 +588,7 @@ void Installer::slotChangedMetaPkgSelection()
QTextStream in(&file);
while (!in.atEnd()) {
QString line = in.readLine();
- if ( line.indexOf('LoadModule: "nvidia"') != -1 ) {
+ if ( line.indexOf("NVIDIA") != -1 ) {
selectedPkgs << "NVIDIA";
break;
}
@@ -1136,7 +1135,7 @@ QStringList Installer::getDiskCfgSettings()
for (int z = 0; z < mounts.size(); ++z) {
if ( copyList.at(i).at(0) == workingDisk \
&& copyList.at(i).at(1) == workingSlice \
- && mounts.at(z) == startPart ) {
+ && ( mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) {
// Check if we have any extra arguments to throw on the end
XtraTmp="";
Please sign in to comment.
Something went wrong with that request. Please try again.