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

[luksBootKeyFile] Remove unused function hasEncryptedRoot()

Browse Source
This commit is contained in:
dalto 2023-08-26 14:15:18 -05:00
parent ab8159a77f
commit b5e0ebe4c9
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,13 +242,6 @@ hasUnencryptedSeparateBoot()
{ return hasMountPoint( partition, QStringLiteral( "/boot" ) ) && !isEncrypted( partition ); } ); { return hasMountPoint( partition, QStringLiteral( "/boot" ) ) && !isEncrypted( partition ); } );
} }
STATICTEST bool
hasEncryptedRoot()
{
return anyPartition( []( const QVariantMap& partition )
{ return hasMountPoint( partition, QStringLiteral( "/" ) ) && isEncrypted( partition ); } );
}
Calamares::JobResult Calamares::JobResult
LuksBootKeyFileJob::exec() LuksBootKeyFileJob::exec()
{ {
@ -300,7 +293,7 @@ LuksBootKeyFileJob::exec()
cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation."; cDebug() << Logger::SubEntry << "/boot partition is not encrypted, skipping keyfile creation.";
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
if ( s.devices.first().passphrase.isEmpty() ) if ( s.devices.first().passphrase.isEmpty() )
{ {
cDebug() << Logger::SubEntry << "No root passphrase."; cDebug() << Logger::SubEntry << "No root passphrase.";

1
src/modules/luksbootkeyfile/Tests.cpp
View File

@ -158,7 +158,6 @@ LuksBootKeyFileTests::testAnyPartition()
{ return hasMountPoint( partdata, QStringLiteral( "/" ) ); } ) ); { return hasMountPoint( partdata, QStringLiteral( "/" ) ); } ) );
QVERIFY( !anyPartition( []( const QVariantMap& partdata ) { return hasMountPoint( partdata, QString() ); } ) ); QVERIFY( !anyPartition( []( const QVariantMap& partdata ) { return hasMountPoint( partdata, QString() ); } ) );
QVERIFY( !hasEncryptedRoot() );
QVERIFY( hasUnencryptedSeparateBoot() ); QVERIFY( hasUnencryptedSeparateBoot() );
} }