napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1823 from calamares/boot-partition

Browse Source 
[partition] offer /boot also when other EFI partition was specified
This commit is contained in:
Adriaan de Groot 2021-11-09 11:24:53 +01:00 committed by GitHub
commit be217c6a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/gui/PartitionDialogHelpers.cpp
View File

@ -2,7 +2,7 @@
* *
* SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org> * SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
* SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org> * SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
* SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot <groot@kde.org> * SPDX-FileCopyrightText: 2018-2021 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
@ -23,15 +23,11 @@
QStringList QStringList
standardMountPoints() standardMountPoints()
{ {
QStringList mountPoints { "/", "/home", "/opt", "/srv", "/usr", "/var" }; QStringList mountPoints { "/", "/boot", "/home", "/opt", "/srv", "/usr", "/var" };
if ( PartUtils::isEfiSystem() ) if ( PartUtils::isEfiSystem() )
{ {
mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
} }
else
{
mountPoints << QStringLiteral( "/boot" );
}
mountPoints.removeDuplicates(); mountPoints.removeDuplicates();
mountPoints.sort(); mountPoints.sort();
return mountPoints; return mountPoints;