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

[luksbootkeyfile] Bump timeout for adding LUKS keyfile

Browse Source
This commit is contained in:
Adriaan de Groot 2021-09-21 12:10:21 +02:00
parent ada13c19fd
commit 1d812f88ce
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,10 @@ generateTargetKeyfile()
return false; return false;
} }
// Give ample time to check that the file was created correctly // Give ample time to check that the file was created correctly;
auto r = CalamaresUtils::System::instance()->targetEnvCommand( { "ls", "-la", "/" } ); // we actually expect ls to return pretty-much-instantly.
auto r = CalamaresUtils::System::instance()->targetEnvCommand(
{ "ls", "-la", "/" }, QString(), QString(), std::chrono::seconds( 5 ) );
cDebug() << "In target system after creating LUKS file" << r.getOutput(); cDebug() << "In target system after creating LUKS file" << r.getOutput();
return true; return true;
} }
@ -132,8 +134,10 @@ generateTargetKeyfile()
static bool static bool
setupLuks( const LuksDevice& d ) setupLuks( const LuksDevice& d )
{ {
// Adding the key can take some times, measured around 15 seconds with
// a HDD (spinning rust) and a slow-ish computer. Give it a minute.
auto r = CalamaresUtils::System::instance()->targetEnvCommand( auto r = CalamaresUtils::System::instance()->targetEnvCommand(
{ "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, std::chrono::seconds( 15 ) ); { "cryptsetup", "luksAddKey", d.device, keyfile }, QString(), d.passphrase, std::chrono::seconds( 60 ) );
if ( r.getExitCode() != 0 ) if ( r.getExitCode() != 0 )
{ {
cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code" cWarning() << "Could not configure LUKS keyfile on" << d.device << ':' << r.getOutput() << "(exit code"