applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 17:35:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modules: chase API change, use std::chrono::seconds

Browse source
This commit is contained in:
Adriaan de Groot 2019-08-01 22:59:06 +02:00
parent e2504627aa
commit a0854a999e
8 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ struct LuksDevice
* Given a list of partitions (as set up by the partitioning module,
* so there's maps with keys inside), returns just the list of
* luks passphrases for each device.
*/
*/
static QList< LuksDevice >
getLuksDevices( const QVariantList& list )
{
@ -130,7 +130,7 @@ static bool
setupLuks( const LuksDevice& d )
{
auto r = CalamaresUtils::System::instance()->targetEnvCommand(
{ "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, 15 );
{ "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, std::chrono::seconds( 15 ) );
if ( r.getExitCode() != 0 )
{
cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code"