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

[partition] Add support for partition uuid

Browse Source
This commit is contained in:
Gaël PORTAY 2020-05-14 12:30:58 -04:00
parent 7e83296aa2
commit da6f728cd4
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -883,6 +883,7 @@ PartitionCoreModule::initLayout( const QVariantList& config )
}
if ( !m_partLayout->addEntry( CalamaresUtils::getString( pentry, "name" ),
CalamaresUtils::getString( pentry, "uuid" ),
CalamaresUtils::getString( pentry, "type" ),
CalamaresUtils::getString( pentry, "mountPoint" ),
CalamaresUtils::getString( pentry, "filesystem" ),

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,
const QString& mountPoint,
const QString& fs,
@ -140,6 +141,7 @@ PartitionLayout::addEntry( const QString& label,
}
entry.partLabel = label;
entry.partUUID = uuid;
entry.partType = type;
entry.partMountPoint = mountPoint;
PartUtils::findFS( fs, &entry.partFileSystem );
@ -244,6 +246,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 )

2
src/modules/partition/core/PartitionLayout.h
View File

@ -41,6 +41,7 @@ public:
struct PartitionEntry
{
QString partLabel;
QString partUUID;
QString partType;
QString partMountPoint;
FileSystem::Type partFileSystem = FileSystem::Unknown;
@ -76,6 +77,7 @@ public:
const QString& min = QString(),
const QString& max = QString() );
bool addEntry( const QString& label,
const QString& uuid,
const QString& type,
const QString& mountPoint,
const QString& fs,

1
src/modules/partition/partition.conf
View File

@ -127,6 +127,7 @@ defaultFileSystemType: "ext4"
# - name: filesystem label
# and
# partition name (gpt only; since KPMCore 4.2.0)
# - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0)
# - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
# - filesystem: filesystem type
# - mountPoint: partition mount point