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

Pick up some older MRs that apply to the older branch.

diff --cc src/modules/partition/core/PartitionCoreModule.cpp
index 5e0f8d3,b3c3409..8856778
--- 1/src/modules/partition/core/PartitionCoreModule.cpp
--- 2/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@@ -883,8 -883,8 +883,9 @@@ PartitionCoreModule::initLayout( const 
          }
  
          if ( !m_partLayout->addEntry( CalamaresUtils::getString( pentry, "name" ),
+                                       CalamaresUtils::getString( pentry, "uuid" ),
                                        CalamaresUtils::getString( pentry, "type" ),
 +                                      CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
                                        CalamaresUtils::getString( pentry, "mountPoint" ),
                                        CalamaresUtils::getString( pentry, "filesystem" ),
                                        CalamaresUtils::getSubMap( pentry, "features", ok ),

diff --cc src/modules/partition/core/PartitionLayout.cpp
index 2e573ac,4516042..b5de916
--- 1/src/modules/partition/core/PartitionLayout.cpp
--- 2/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@@ -118,8 -118,8 +118,9 @@@ PartitionLayout::addEntry( const QStrin
  
  bool
  PartitionLayout::addEntry( const QString& label,
+                            const QString& uuid,
                             const QString& type,
 +                           quint64 attributes,
                             const QString& mountPoint,
                             const QString& fs,
                             const QVariantMap& features,
@@@ -141,8 -141,8 +142,9 @@@
      }
  
      entry.partLabel = label;
+     entry.partUUID = uuid;
      entry.partType = type;
 +    entry.partAttributes = attributes;
      entry.partMountPoint = mountPoint;
      PartUtils::findFS( fs, &entry.partFileSystem );
      if ( entry.partFileSystem == FileSystem::Unknown )

diff --cc src/modules/partition/core/PartitionLayout.h
index d7af5df,a7bfcc4..24c10bf
--- 1/src/modules/partition/core/PartitionLayout.h
--- 2/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@@ -41,8 -41,8 +41,9 @@@ public
      struct PartitionEntry
      {
          QString partLabel;
+         QString partUUID;
          QString partType;
 +        quint64 partAttributes;
          QString partMountPoint;
          FileSystem::Type partFileSystem = FileSystem::Unknown;
          QVariantMap partFeatures;
@@@ -77,8 -77,8 +78,9 @@@
                     const QString& min = QString(),
                     const QString& max = QString() );
      bool addEntry( const QString& label,
+                    const QString& uuid,
                     const QString& type,
 +                   quint64 attributes,
                     const QString& mountPoint,
                     const QString& fs,
                     const QVariantMap& features,

diff --cc src/modules/partition/partition.conf
index b046881,158258f..51dc70e
--- 1/src/modules/partition/partition.conf
--- 2/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@@ -128,8 -127,8 +128,9 @@@ 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)
 +#   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
  #   - filesystem: filesystem type
  #   - mountPoint: partition mount point
  #   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)