From f34008b518de5be96a7553f4781077c20f9d358d Mon Sep 17 00:00:00 2001
From: dalto <dalto@fastmail.com>
Date: Wed, 16 Feb 2022 16:21:52 -0600
Subject: [PATCH] [LuksBootKeyFile] Remove trailing slashes when matching
 mountpoint

---
 src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 43da3971a..137cb750d 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -17,6 +17,8 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
+#include <QDir>
+
 LuksBootKeyFileJob::LuksBootKeyFileJob( QObject* parent )
     : Calamares::CppJob( parent )
 {
@@ -162,7 +164,7 @@ hasUnencryptedSeparateBoot()
     {
         QVariantMap partitionMap = partition.toMap();
         QString mountPoint = partitionMap.value( QStringLiteral( "mountPoint" ) ).toString();
-        if ( mountPoint == QStringLiteral( "/boot" ) )
+        if ( QDir::cleanPath( mountPoint ) == QStringLiteral( "/boot" ) )
         {
             return !partitionMap.contains( QStringLiteral( "luksMapperName" ) );
         }