applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

If dont-chroot is set, don't chroot target env calls.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-08-06 12:45:03 +02:00
parent 2c9524aebd
commit 2e3751ffa7
3 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View file

@ -99,24 +99,37 @@ targetEnvOutput( const QStringList& args,
return -3;
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( !gs || !gs->contains( "rootMountPoint" ) )
if ( !gs ||
( doChroot && !gs->contains( "rootMountPoint" ) ) )
{
cLog() << "No rootMountPoint in global storage";
return -3;
}
QString destDir = gs->value( "rootMountPoint" ).toString();
if ( !QDir( destDir ).exists() )
QProcess process;
QString program;
QStringList arguments;
if ( doChroot )
{
cLog() << "rootMountPoint points to a dir which does not exist";
return -3;
QString destDir = gs->value( "rootMountPoint" ).toString();
if ( !QDir( destDir ).exists() )
{
cLog() << "rootMountPoint points to a dir which does not exist";
return -3;
}
program = "chroot";
arguments = QStringList( { destDir } );
arguments << args;
}
else
{
program = "sh";
arguments = QStringList( { "-c" } );
arguments << args;
}
QString program( "chroot" );
QStringList arguments = { destDir };
arguments << args;
QProcess process;
process.setProgram( program );
process.setArguments( arguments );
process.setProcessChannelMode( QProcess::MergedChannels );