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

[partition] Simplify logic for checking for unencrypted /boot

Browse Source
This commit is contained in:
Adriaan de Groot 2024-04-02 23:20:35 +02:00
parent f0c2295606
commit 36485c8571
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/PartitionViewStep.cpp
View File

@ -497,11 +497,12 @@ shouldWarnForNotEncryptedBoot( const Config* config, const PartitionCoreModule*
Partition* root_p = core->findPartitionByMountPoint( "/" ); Partition* root_p = core->findPartitionByMountPoint( "/" );
Partition* boot_p = core->findPartitionByMountPoint( "/boot" ); Partition* boot_p = core->findPartitionByMountPoint( "/boot" );
if ( root_p and boot_p ) if ( root_p && boot_p )
{ {
if ( ( root_p->fileSystem().type() == FileSystem::Luks && boot_p->fileSystem().type() != FileSystem::Luks ) const auto encryptionMismatch
|| ( root_p->fileSystem().type() == FileSystem::Luks2 = [ root_t = root_p->fileSystem().type(), boot_t = boot_p->fileSystem().type() ]( FileSystem::Type t )
&& boot_p->fileSystem().type() != FileSystem::Luks2 ) ) { return root_t == t && boot_t != t; };
if ( encryptionMismatch( FileSystem::Luks ) || encryptionMismatch( FileSystem::Luks2 ) )
{ {
return true; return true;
} }