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

[machineid] Read configuration map into instance vars

Browse Source
This commit is contained in:
Adriaan de Groot 2019-10-01 14:36:21 +02:00
parent 3ae5a3db76
commit be27b44818
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/machineid/MachineIdJob.cpp
View File

@ -23,6 +23,7 @@
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Variant.h"
MachineIdJob::MachineIdJob( QObject* parent ) MachineIdJob::MachineIdJob( QObject* parent )
: Calamares::CppJob( parent ) : Calamares::CppJob( parent )
@ -48,8 +49,27 @@ MachineIdJob::exec()
void void
MachineIdJob::setConfigurationMap( const QVariantMap& configurationMap ) MachineIdJob::setConfigurationMap( const QVariantMap& map )
{ {
m_systemd = CalamaresUtils::getBool( map, "systemd", false );
m_dbus = CalamaresUtils::getBool( map, "dbus", false );
if ( map.contains( "dbus-symlink" ) )
{
m_dbus_symlink = CalamaresUtils::getBool( map, "dbus-symlink", false );
}
else if ( map.contains( "symlink" ) )
{
m_dbus_symlink = CalamaresUtils::getBool( map, "symlink", false );
cWarning() << "MachineId: configuration setting *symlink* is deprecated, use *dbus-symlink*.";
}
// else it's still false from the constructor
// ignore it, though, if dbus is false
m_dbus_symlink = m_dbus && m_dbus_symlink;
m_entropy = CalamaresUtils::getBool( map, "entropy", false );
m_entropy_copy = CalamaresUtils::getBool( map, "entropy-copy", false );
} }
CALAMARES_PLUGIN_FACTORY_DEFINITION( MachineIdJobFactory, registerPlugin< MachineIdJob >(); ) CALAMARES_PLUGIN_FACTORY_DEFINITION( MachineIdJobFactory, registerPlugin< MachineIdJob >(); )

9
src/modules/machineid/MachineIdJob.h
View File

@ -41,6 +41,15 @@ public:
Calamares::JobResult exec() override; Calamares::JobResult exec() override;
void setConfigurationMap( const QVariantMap& configurationMap ) override; void setConfigurationMap( const QVariantMap& configurationMap ) override;
private:
bool m_systemd = false; ///< write systemd's files
bool m_dbus = false; ///< write dbus files
bool m_dbus_symlink = false; ///< .. or just symlink to systemd
bool m_entropy = false; ///< write an entropy file
bool m_entropy_copy = false; ///< copy from host system
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( MachineIdJobFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( MachineIdJobFactory )