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

Update LuksBootKeyFileJob.cpp

Browse Source
This commit is contained in:
Brian Morison 2023-08-20 13:28:06 -06:00 committed by GitHub
parent f0fb39edd8
commit ab8159a77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,22 +294,13 @@ LuksBootKeyFileJob::exec()
return Calamares::JobResult::ok();
}
if ( hasUnencryptedSeparateBoot() && !hasEncryptedRoot() )
if ( hasUnencryptedSeparateBoot() )
{
// /boot partition is not encrypted, keyfile must not be used
// But only if root partition is not encrypted
// /boot partition is not encrypted, keyfile must not be used.
cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
return Calamares::JobResult::ok();
}
if ( hasUnencryptedSeparateBoot() && hasEncryptedRoot() )
{
// /boot partition is not encrypted, keyfile must not be used
// But only if root partition is encrypted
cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
return Calamares::JobResult::ok();
}
if ( s.devices.first().passphrase.isEmpty() )
{
cDebug() << Logger::SubEntry << "No root passphrase.";