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

[machineid] Apply coding style

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

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

@ -157,21 +157,24 @@ createSystemdMachineId( SystemdMachineIdStyle style, const QString& rootMountPoi
{ {
Q_UNUSED( rootMountPoint ) Q_UNUSED( rootMountPoint )
Q_UNUSED( fileName ) Q_UNUSED( fileName )
const QString machineIdFile = QStringLiteral("/etc/machine-id"); const QString machineIdFile = QStringLiteral( "/etc/machine-id" );
switch(style) switch ( style )
{ {
case SystemdMachineIdStyle::Uuid: case SystemdMachineIdStyle::Uuid:
return runCmd( QStringList { QStringLiteral( "systemd-machine-id-setup" ) } ); return runCmd( QStringList { QStringLiteral( "systemd-machine-id-setup" ) } );
case SystemdMachineIdStyle::Blank: case SystemdMachineIdStyle::Blank:
Calamares::System::instance()->createTargetFile(machineIdFile, QByteArray(), Calamares::System::WriteMode::Overwrite); Calamares::System::instance()->createTargetFile(
return Calamares::JobResult::ok(); machineIdFile, QByteArray(), Calamares::System::WriteMode::Overwrite );
case SystemdMachineIdStyle::Uninitialized: return Calamares::JobResult::ok();
Calamares::System::instance()->createTargetFile(machineIdFile, "uninitialized\n", Calamares::System::WriteMode::Overwrite); case SystemdMachineIdStyle::Uninitialized:
return Calamares::JobResult::ok(); 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); return Calamares::JobResult::internalError( QStringLiteral( "Invalid systemd-style" ),
QStringLiteral( "Invalid value %1" ).arg( int( style ) ),
Calamares::JobResult::InvalidConfiguration );
} }
Calamares::JobResult Calamares::JobResult