From 3bb5adcfca74b5d7fc5220307e4f54ce8168a463 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 28 Sep 2020 14:52:18 +0200
Subject: [PATCH] [partition] Simplify *efiSystemPartition* settings

---
 src/modules/partition/gui/PartitionViewStep.cpp | 6 +-----
 src/modules/partition/partition.conf            | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 0fe8f2466..6138498e3 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -523,11 +523,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     // Copy the efiSystemPartition setting to the global storage. It is needed not only in
     // the EraseDiskPage, but also in the bootloader configuration modules (grub, bootloader).
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition" );
-    if ( efiSP.isEmpty() )
-    {
-        efiSP = QStringLiteral( "/boot/efi" );
-    }
+    QString efiSP = CalamaresUtils::getString( configurationMap, "efiSystemPartition", QStringLiteral( "/boot/efi" ) );
     gs->insert( "efiSystemPartition", efiSP );
 
     // Set up firmwareType global storage entry. This is used, e.g. by the bootloader module.
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 5f9842394..007d7b36e 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -4,6 +4,8 @@
 # This setting specifies the mount point of the EFI system partition. Some
 # distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
 # etc.) use just /boot.
+#
+# Defaults to "/boot/efi", may be empty (but weird effects ensue)
 efiSystemPartition:     "/boot/efi"
 
 # This optional setting specifies the size of the EFI system partition.