|
|
|
@ -59,6 +59,7 @@ handle_args( QCoreApplication& a )
|
|
|
|
|
|
|
|
|
|
|
|
parser.addOption( debugLevelOption );
|
|
|
|
parser.addOption( debugLevelOption );
|
|
|
|
parser.addPositionalArgument( "module", "Path or name of module to run." );
|
|
|
|
parser.addPositionalArgument( "module", "Path or name of module to run." );
|
|
|
|
|
|
|
|
parser.addPositionalArgument( "config", "Path of job-config file to use.", "[config]");
|
|
|
|
|
|
|
|
|
|
|
|
parser.process( a );
|
|
|
|
parser.process( a );
|
|
|
|
|
|
|
|
|
|
|
|
@ -140,6 +141,8 @@ load_module( const ModuleConfig& moduleConfig )
|
|
|
|
? moduleDirectory + '/' + name + ".conf"
|
|
|
|
? moduleDirectory + '/' + name + ".conf"
|
|
|
|
: moduleConfig.configFile() );
|
|
|
|
: moduleConfig.configFile() );
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cDebug() << "Module" << moduleName << "job-configuration:" << configFile;
|
|
|
|
|
|
|
|
|
|
|
|
Calamares::Module* module = Calamares::Module::fromDescriptor(
|
|
|
|
Calamares::Module* module = Calamares::Module::fromDescriptor(
|
|
|
|
descriptor, name, configFile, moduleDirectory );
|
|
|
|
descriptor, name, configFile, moduleDirectory );
|
|
|
|
|
|
|
|
|
|
|
|
|