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

[libcalamares] Switch @@ROOT@@ magic around

Browse Source 
The substitution of @@ROOT@@ should happen when running in the
host, not in the target, system. Also only complain about it
if @@ROOT@@ is actually used in the commands.

FIXES #954
This commit is contained in:
Adriaan de Groot 2018-05-16 11:20:40 -04:00
parent f6f34bbec3
commit c73d6e80f6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamares/utils/CommandList.cpp
View File

@ -100,18 +100,29 @@ CommandList::~CommandList()
Calamares::JobResult CommandList::run() Calamares::JobResult CommandList::run()
{ {
QLatin1Literal rootMagic( "@@ROOT@@" );
System::RunLocation location = m_doChroot ? System::RunLocation::RunInTarget : System::RunLocation::RunInHost; System::RunLocation location = m_doChroot ? System::RunLocation::RunInTarget : System::RunLocation::RunInHost;
/* Figure out the replacement for @@ROOT@@ */ /* Figure out the replacement for @@ROOT@@ */
QString root = QStringLiteral( "/" ); QString root = QStringLiteral( "/" );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( location == System::RunLocation::RunInTarget )
bool needsRootSubstitution = false;
for ( CommandList::const_iterator i = cbegin(); i != cend(); ++i )
if ( i->command().contains( rootMagic ) )
{
needsRootSubstitution = true;
break;
}
if ( needsRootSubstitution && ( location == System::RunLocation::RunInHost ) )
{ {
if ( !gs || !gs->contains( "rootMountPoint" ) ) if ( !gs || !gs->contains( "rootMountPoint" ) )
{ {
cError() << "No rootMountPoint defined."; cError() << "No rootMountPoint defined.";
return Calamares::JobResult::error( QCoreApplication::translate( "CommandList", "Could not run command." ), return Calamares::JobResult::error( QCoreApplication::translate( "CommandList", "Could not run command." ),
QCoreApplication::translate( "CommandList", "No rootMountPoint is defined, so command cannot be run in the target environment." ) ); QCoreApplication::translate( "CommandList", "The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined." ) );
} }
root = gs->value( "rootMountPoint" ).toString(); root = gs->value( "rootMountPoint" ).toString();
} }
@ -119,7 +130,7 @@ Calamares::JobResult CommandList::run()
for ( CommandList::const_iterator i = cbegin(); i != cend(); ++i ) for ( CommandList::const_iterator i = cbegin(); i != cend(); ++i )
{ {
QString processed_cmd = i->command(); QString processed_cmd = i->command();
processed_cmd.replace( "@@ROOT@@", root ); processed_cmd.replace( rootMagic, root );
bool suppress_result = false; bool suppress_result = false;
if ( processed_cmd.startsWith( '-' ) ) if ( processed_cmd.startsWith( '-' ) )
{ {