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

[machineid] Handle different settings of systemd-style

Browse Source
This commit is contained in:
Adriaan de Groot 2023-12-08 22:43:00 +01:00
parent 0eb387d6de
commit e5ee28329d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/machineid/Workers.cpp
View File

@ -155,10 +155,23 @@ runCmd( const QStringList& cmd )
Calamares::JobResult Calamares::JobResult
createSystemdMachineId( SystemdMachineIdStyle style, const QString& rootMountPoint, const QString& fileName ) createSystemdMachineId( SystemdMachineIdStyle style, const QString& rootMountPoint, const QString& fileName )
{ {
Q_UNUSED( style )
Q_UNUSED( rootMountPoint ) Q_UNUSED( rootMountPoint )
Q_UNUSED( fileName ) 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 Calamares::JobResult