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

chroot calls are now generic "target env" calls.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-08-06 11:57:01 +02:00
parent da79082b13
commit bf885d65db
9 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,13 +59,13 @@ mount( const QString& devicePath,
}
int
chrootCall( const QStringList& args,
targetEnvCall( const QStringList& args,
const QString& workingPath,
const QString& stdInput,
int timeoutSec )
{
QString discard;
return chrootOutput( args,
return targetEnvOutput( args,
discard,
workingPath,
stdInput,
@ -74,12 +74,12 @@ chrootCall( const QStringList& args,
int
chrootCall( const QString& command,
targetEnvCall( const QString& command,
const QString& workingPath,
const QString& stdInput,
int timeoutSec )
{
return chrootCall( QStringList{ command },
return targetEnvCall( QStringList{ command },
workingPath,
stdInput,
timeoutSec );
@ -87,7 +87,7 @@ chrootCall( const QString& command,
int
chrootOutput( const QStringList& args,
targetEnvOutput( const QStringList& args,
QString& output,
const QString& workingPath,
const QString& stdInput,
@ -165,13 +165,13 @@ chrootOutput( const QStringList& args,
int
chrootOutput( const QString& command,
targetEnvOutput( const QString& command,
QString& output,
const QString& workingPath,
const QString& stdInput,
int timeoutSec )
{
return chrootOutput( QStringList{ command },
return targetEnvOutput( QStringList{ command },
output,
workingPath,
stdInput,