From 0486e48c4eecaa42c1cd54151bc169036396b67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Tue, 9 Nov 2021 01:51:49 +0100
Subject: [PATCH] [partition] offer /boot also when other EFI partition was
 specified - it still makes sense to offer /boot in EFI - example: /boot ext4,
 /boot/efi vfat - this partly reverts 60f8a7c5fb276cac4b9c802f5d3fcedb54e56668

---
 src/modules/partition/gui/PartitionDialogHelpers.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/modules/partition/gui/PartitionDialogHelpers.cpp b/src/modules/partition/gui/PartitionDialogHelpers.cpp
index 0d25c3c8d..65e88f898 100644
--- a/src/modules/partition/gui/PartitionDialogHelpers.cpp
+++ b/src/modules/partition/gui/PartitionDialogHelpers.cpp
@@ -2,7 +2,7 @@
  *
  *   SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@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
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -23,15 +23,11 @@
 QStringList
 standardMountPoints()
 {
-    QStringList mountPoints { "/", "/home", "/opt", "/srv", "/usr", "/var" };
+    QStringList mountPoints { "/", "/boot", "/home", "/opt", "/srv", "/usr", "/var" };
     if ( PartUtils::isEfiSystem() )
     {
         mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
     }
-    else
-    {
-        mountPoints << QStringLiteral( "/boot" );
-    }
     mountPoints.removeDuplicates();
     mountPoints.sort();
     return mountPoints;