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

[luksbootkeyfile] Merge pull request #1888 from dalto8/trailingslash

Browse Source 
Ensure that a trailing slash doesn't cause issues with an unencrypted /boot
This commit is contained in:
Adriaan de Groot 2022-02-21 11:43:11 +01:00 committed by GitHub
commit 240c89c585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include <QDir>
LuksBootKeyFileJob::LuksBootKeyFileJob( QObject* parent ) LuksBootKeyFileJob::LuksBootKeyFileJob( QObject* parent )
: Calamares::CppJob( parent ) : Calamares::CppJob( parent )
{ {
@ -162,7 +164,7 @@ hasUnencryptedSeparateBoot()
{ {
QVariantMap partitionMap = partition.toMap(); QVariantMap partitionMap = partition.toMap();
QString mountPoint = partitionMap.value( QStringLiteral( "mountPoint" ) ).toString(); QString mountPoint = partitionMap.value( QStringLiteral( "mountPoint" ) ).toString();
if ( mountPoint == QStringLiteral( "/boot" ) ) if ( QDir::cleanPath( mountPoint ) == QStringLiteral( "/boot" ) )
{ {
return !partitionMap.contains( QStringLiteral( "luksMapperName" ) ); return !partitionMap.contains( QStringLiteral( "luksMapperName" ) );
} }