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

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

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::getUnsignedInteger( pentry, "attributes", 0 ),
CalamaresUtils::getString( pentry, "mountPoint" ),