From be27b448181ad5fe0be1a552cd6583289636941e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 1 Oct 2019 14:36:21 +0200
Subject: [PATCH] [machineid] Read configuration map into instance vars

---
 src/modules/machineid/MachineIdJob.cpp | 22 +++++++++++++++++++++-
 src/modules/machineid/MachineIdJob.h   |  9 +++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp
index b604c645b..3fd539e80 100644
--- a/src/modules/machineid/MachineIdJob.cpp
+++ b/src/modules/machineid/MachineIdJob.cpp
@@ -23,6 +23,7 @@
 
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
+#include "utils/Variant.h"
 
 MachineIdJob::MachineIdJob( QObject* parent )
     : Calamares::CppJob( parent )
@@ -48,8 +49,27 @@ MachineIdJob::exec()
 
 
 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 >(); )
diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h
index 7fb705201..d775d9007 100644
--- a/src/modules/machineid/MachineIdJob.h
+++ b/src/modules/machineid/MachineIdJob.h
@@ -41,6 +41,15 @@ public:
     Calamares::JobResult exec() 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 )