From e5ee28329d705fcfb43369d09c3ac40c8d9a21b1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 8 Dec 2023 22:43:00 +0100 Subject: [PATCH] [machineid] Handle different settings of systemd-style --- src/modules/machineid/Workers.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp index 497ff943a..31e0e8030 100644 --- a/src/modules/machineid/Workers.cpp +++ b/src/modules/machineid/Workers.cpp @@ -155,10 +155,23 @@ runCmd( const QStringList& cmd ) Calamares::JobResult 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" ) } ); + const QString machineIdFile = QStringLiteral("/etc/machine-id"); + + switch(style) + { + case SystemdMachineIdStyle::Uuid: + return runCmd( QStringList { QStringLiteral( "systemd-machine-id-setup" ) } ); + case SystemdMachineIdStyle::Blank: + Calamares::System::instance()->createTargetFile(machineIdFile, QByteArray(), Calamares::System::WriteMode::Overwrite); + return Calamares::JobResult::ok(); + case SystemdMachineIdStyle::Uninitialized: + Calamares::System::instance()->createTargetFile(machineIdFile, "uninitialized\n", Calamares::System::WriteMode::Overwrite); + return Calamares::JobResult::ok(); + + } + return Calamares::JobResult::internalError(QStringLiteral("Invalid systemd-style"), QStringLiteral("Invalid value %1").arg(int(style)), Calamares::JobResult::InvalidConfiguration); } Calamares::JobResult