From 1f9f506a16e26d6e41bad65fadb2cfdca47d5a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 17 Jun 2020 14:16:20 -0400 Subject: [PATCH] [partition] Make mountPoint optional Some devices cannot be mounted (as DM_verity_hash), therefore, it is nosense to set a mountPoint for them. --- src/modules/partition/core/PartitionLayout.cpp | 3 +-- src/modules/partition/partition.conf | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 15b18da93..0b0c7bedf 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -134,8 +134,7 @@ PartitionLayout::init( const QVariantList& config ) { QVariantMap pentry = r.toMap(); - if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || !pentry.contains( "filesystem" ) - || !pentry.contains( "size" ) ) + if ( !pentry.contains( "name" ) || !pentry.contains( "filesystem" ) || !pentry.contains( "size" ) ) { cError() << "Partition layout entry #" << config.indexOf( r ) << "lacks mandatory attributes, switching to default layout."; diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 41652fe7d..ed2719ca7 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -208,7 +208,7 @@ defaultFileSystemType: "ext4" # - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0) # - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0) # - filesystem: filesystem type -# - mountPoint: partition mount point +# - mountPoint: partition mount point (optional parameter; not mounted if unset) # - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB) # or # % of the available drive space if a '%' is appended to the value