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

[LuksBootKeyFile] Remove trailing slashes when matching mountpoint

Browse Source
This commit is contained in:
dalto 2022-02-16 16:21:52 -06:00
parent 9f6f82405b
commit f34008b518
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
View File

@ -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" ) );
}