applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 10:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into calamares

Browse source 
Pick up some older MRs that apply to the older branch.
This commit is contained in:
Adriaan de Groot 2020-06-16 16:45:49 +02:00
commit e3b8570d61
6 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/partition/core/PartitionLayout.cpp
View file

@ -118,6 +118,7 @@ PartitionLayout::addEntry( const QString& mountPoint, const QString& size, const
bool
PartitionLayout::addEntry( const QString& label,
const QString& uuid,
const QString& type,
quint64 attributes,
const QString& mountPoint,
@ -141,6 +142,7 @@ PartitionLayout::addEntry( const QString& label,
}
entry.partLabel = label;
entry.partUUID = uuid;
entry.partType = type;
entry.partAttributes = attributes;
entry.partMountPoint = mountPoint;
@ -246,6 +248,10 @@ PartitionLayout::execute( Device* dev,
currentPartition->setLabel( part.partLabel );
currentPartition->fileSystem().setLabel( part.partLabel );
}
if ( !part.partUUID.isEmpty() )
{
currentPartition->setUUID( part.partUUID );
}
if ( !part.partType.isEmpty() )
{
#if defined( WITH_KPMCORE42API )