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

Merge branch 'ff-fslabel' into calamares

Browse Source 
Fix build with newer KPMCore (still builds on Netrunner 19).
This commit is contained in:
Adriaan de Groot 2021-03-28 18:28:28 +02:00
commit b95b3dbc78
1 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
View File

@ -12,12 +12,10 @@
#include "utils/Logger.h" #include "utils/Logger.h"
#include <kpmcore/backend/corebackend.h> #include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendmanager.h> #include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackendpartition.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h> #include <kpmcore/core/partition.h>
#include <kpmcore/ops/setfilesystemlabeloperation.h>
#include <kpmcore/util/report.h> #include <kpmcore/util/report.h>
ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel ) ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* partition, const QString& newLabel )
@ -61,45 +59,13 @@ ChangeFilesystemLabelJob::exec()
} }
Report report( nullptr ); Report report( nullptr );
CoreBackend* backend = CoreBackendManager::self()->backend(); SetFileSystemLabelOperation op( *partition(), m_label );
op.setStatus( Operation::StatusRunning );
QScopedPointer< CoreBackendDevice > backendDevice( backend->openDevice( m_device->deviceNode() ) ); if ( op.execute( report ) )
if ( !backendDevice.data() )
{ {
return Calamares::JobResult::error( tr( "Could not open device '%1'." ).arg( m_device->deviceNode() ),
report.toText() );
}
QScopedPointer< CoreBackendPartitionTable > backendPartitionTable( backendDevice->openPartitionTable() );
if ( !backendPartitionTable.data() )
{
return Calamares::JobResult::error(
tr( "Could not open partition table on device '%1'." ).arg( m_device->deviceNode() ), report.toText() );
}
QScopedPointer< CoreBackendPartition > backendPartition(
( partition()->roles().has( PartitionRole::Extended ) )
? backendPartitionTable->getExtendedPartition()
: backendPartitionTable->getPartitionBySector( partition()->firstSector() ) );
if ( !backendPartition.data() )
{
return Calamares::JobResult::error( tr( "Could not find partition '%1'." ).arg( partition()->partitionPath() ),
report.toText() );
}
FileSystem& fs = m_partition->fileSystem();
fs.setLabel( m_label );
if ( !backendPartitionTable->setPartitionSystemType( report, *m_partition ) )
{
return Calamares::JobResult::error(
tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ),
report.toText() );
}
backendPartitionTable->commit();
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
}
return Calamares::JobResult::error(
tr( "The installer failed to update partition table on disk '%1'." ).arg( m_device->name() ), report.toText() );
} }
#include "ChangeFilesystemLabelJob.moc"