From 44d12379bd21049276237cc79ec37180d8a38cef Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 2 Nov 2023 21:22:35 +0100
Subject: [PATCH] machineid: pass around enum for style

---
 src/modules/machineid/MachineIdJob.cpp |  2 +-
 src/modules/machineid/MachineIdJob.h   | 14 ++++++++------
 src/modules/machineid/Workers.cpp      |  3 ++-
 src/modules/machineid/Workers.h        | 11 ++++++++++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp
index 41a216dd6..da0afca93 100644
--- a/src/modules/machineid/MachineIdJob.cpp
+++ b/src/modules/machineid/MachineIdJob.cpp
@@ -96,7 +96,7 @@ MachineIdJob::exec()
         {
             cWarning() << "Could not create systemd data-directory.";
         }
-        auto r = MachineId::createSystemdMachineId( root, target_systemd_machineid_file );
+        auto r = MachineId::createSystemdMachineId( m_systemd_style, root, target_systemd_machineid_file );
         if ( !r )
         {
             return r;
diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h
index 7f406fc55..52983f235 100644
--- a/src/modules/machineid/MachineIdJob.h
+++ b/src/modules/machineid/MachineIdJob.h
@@ -10,16 +10,16 @@
 #ifndef MACHINEIDJOB_H
 #define MACHINEIDJOB_H
 
+#include "Workers.h"
+
+#include "CppJob.h"
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+
 #include <QObject>
 #include <QStringList>
 #include <QVariantMap>
 
-#include "CppJob.h"
-
-#include "utils/PluginFactory.h"
-
-#include "DllMacro.h"
-
 /** @brief Write 'random' data: machine id, entropy, UUIDs
  *
  */
@@ -48,6 +48,8 @@ public:
 private:
     bool m_systemd = false;  ///< write systemd's files
 
+    MachineId::SystemdMachineIdStyle m_systemd_style = MachineId::SystemdMachineIdStyle::Blank;
+
     bool m_dbus = false;  ///< write dbus files
     bool m_dbus_symlink = false;  ///< .. or just symlink to systemd
 
diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp
index 6fe631f2e..497ff943a 100644
--- a/src/modules/machineid/Workers.cpp
+++ b/src/modules/machineid/Workers.cpp
@@ -153,8 +153,9 @@ runCmd( const QStringList& cmd )
 }
 
 Calamares::JobResult
-createSystemdMachineId( const QString& rootMountPoint, const QString& fileName )
+createSystemdMachineId( SystemdMachineIdStyle style, const QString& rootMountPoint, const QString& fileName )
 {
+    Q_UNUSED( style )
     Q_UNUSED( rootMountPoint )
     Q_UNUSED( fileName )
     return runCmd( QStringList { QStringLiteral( "systemd-machine-id-setup" ) } );
diff --git a/src/modules/machineid/Workers.h b/src/modules/machineid/Workers.h
index 51c9d526d..577090a46 100644
--- a/src/modules/machineid/Workers.h
+++ b/src/modules/machineid/Workers.h
@@ -52,6 +52,7 @@ createEntropy( const EntropyGeneration kind, const QString& rootMountPoint, cons
  * Creating UUIDs for DBUS and SystemD.
  */
 
+
 /// @brief Create a new DBus UUID file
 Calamares::JobResult createDBusMachineId( const QString& rootMountPoint, const QString& fileName );
 
@@ -59,7 +60,15 @@ Calamares::JobResult createDBusMachineId( const QString& rootMountPoint, const Q
 Calamares::JobResult
 createDBusLink( const QString& rootMountPoint, const QString& fileName, const QString& systemdFileName );
 
-Calamares::JobResult createSystemdMachineId( const QString& rootMountPoint, const QString& fileName );
+enum class SystemdMachineIdStyle
+{
+    Uuid,
+    Blank,
+    Uninitialized
+};
+
+Calamares::JobResult
+createSystemdMachineId( SystemdMachineIdStyle style, const QString& rootMountPoint, const QString& fileName );
 
 
 }  // namespace MachineId