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

Merge pull request #1347 from gportay/partition-name

Browse Source 
[partition] Name partition using filesystem label
This commit is contained in:
Adriaan de Groot 2020-03-23 16:59:01 +01:00 committed by GitHub
commit 377a78a405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ PartitionLayout::execute( Device* dev,
PartitionInfo::setMountPoint( currentPartition, part.partMountPoint ); PartitionInfo::setMountPoint( currentPartition, part.partMountPoint );
if ( !part.partLabel.isEmpty() ) if ( !part.partLabel.isEmpty() )
{ {
currentPartition->setLabel( part.partLabel );
currentPartition->fileSystem().setLabel( part.partLabel ); currentPartition->fileSystem().setLabel( part.partLabel );
} }
if ( !part.partFeatures.isEmpty() ) if ( !part.partFeatures.isEmpty() )

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

@ -118,7 +118,9 @@ defaultFileSystemType: "ext4"
# size: 100% # size: 100%
# #
# There can be any number of partitions, each entry having the following attributes: # There can be any number of partitions, each entry having the following attributes:
# - name: partition label # - name: filesystem label
# and
# partition name (gpt only; since KPMCore 4.2.0)
# - filesystem: filesystem type # - filesystem: filesystem type
# - mountPoint: partition mount point # - mountPoint: partition mount point
# - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB) # - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)