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

chrootCall: Log messages on failure, as well as command outputs

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-08-01 17:10:25 +02:00
parent 6376e1daef
commit 26e5500e33
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -18,6 +18,7 @@
#include "CalamaresUtilsSystem.h" #include "CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -61,11 +62,17 @@ int chrootCall( const QStringList& args,
{ {
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( !gs->contains( "rootMountPoint" ) ) if ( !gs->contains( "rootMountPoint" ) )
{
cLog() << "No rootMountPoint in global storage";
return -3; return -3;
}
QString destDir = gs->value( "rootMountPoint" ).toString(); QString destDir = gs->value( "rootMountPoint" ).toString();
if ( !QDir( destDir ).exists() ) if ( !QDir( destDir ).exists() )
{
cLog() << "rootMountPoint points to a dir which does not exist";
return -3; return -3;
}
QString program( "chroot" ); QString program( "chroot" );
QStringList arguments = { destDir }; QStringList arguments = { destDir };
@ -74,10 +81,15 @@ int chrootCall( const QStringList& args,
QProcess process; QProcess process;
process.setProgram( program ); process.setProgram( program );
process.setArguments( arguments ); process.setArguments( arguments );
process.setProcessChannelMode( QProcess::MergedChannels );
cLog() << "Running" << program << arguments;
process.start(); process.start();
if ( !process.waitForStarted() ) if ( !process.waitForStarted() )
{
cLog() << "Process failed to start" << process.error();
return -2; return -2;
}
if ( !stdInput.isEmpty() ) if ( !stdInput.isEmpty() )
{ {
@ -86,11 +98,22 @@ int chrootCall( const QStringList& args,
} }
if ( !process.waitForFinished( timeoutSec ? ( timeoutSec * 1000 ) : 30000 ) ) if ( !process.waitForFinished( timeoutSec ? ( timeoutSec * 1000 ) : 30000 ) )
{
cLog() << "Timed out. output so far:";
cLog() << process.readAllStandardOutput();
return -4; return -4;
}
cLog() << "Output:";
cLog() << process.readAllStandardOutput();
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{
cLog() << "Process crashed";
return -1; return -1;
}
cLog() << "Finished. Exit code:" << process.exitCode();
return process.exitCode(); return process.exitCode();
} }