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

[machineid] Keep the paths unsullied

Browse Source 
- keep the rootMountPoint and the path-with-random-data separate
   instead of concatenating them at the beginning. Then we can
   use the "clean" names also within the host system.
This commit is contained in:
Adriaan de Groot 2019-10-01 16:01:10 +02:00
parent 3a8d543c72
commit 9cbfd200a1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/machineid/MachineIdJob.cpp
View File

@ -47,9 +47,9 @@ MachineIdJob::prettyName() const
// might need to use a helper to remove the file
static void
removeFile( const QString& fileName )
removeFile( const QString& rootMountPoint, const QString& fileName )
{
QFile::remove( fileName );
QFile::remove( rootMountPoint + fileName );
}
Calamares::JobResult
@ -70,22 +70,22 @@ MachineIdJob::exec()
Calamares::JobResult::InvalidConfiguration );
}
QString target_systemd_machineid_file = root + QStringLiteral( "/etc/machine-id" );
QString target_dbus_machineid_file = root + QStringLiteral( "/var/lib/dbus/machine-id" );
QString target_entropy_file = root + QStringLiteral( "/var/lib/urandom/random-seed" );
QString target_systemd_machineid_file = QStringLiteral( "/etc/machine-id" );
QString target_dbus_machineid_file = QStringLiteral( "/var/lib/dbus/machine-id" );
QString target_entropy_file = QStringLiteral( "/var/lib/urandom/random-seed" );
// Clear existing files
if ( m_entropy )
{
removeFile( target_entropy_file );
removeFile( root, target_entropy_file );
}
if ( m_dbus )
{
removeFile( target_dbus_machineid_file );
removeFile( root, target_dbus_machineid_file );
}
if ( m_systemd )
{
removeFile( target_systemd_machineid_file );
removeFile( root, target_systemd_machineid_file );
}
return Calamares::JobResult::ok();