mirror of
https://github.com/parchlinux/calamares.git
synced 2025-07-02 03:45:38 -04:00
Merge remote-tracking branch 'origin/master' into calamares
Pick up some older MRs that apply to the older branch.
This commit is contained in:
commit
e3b8570d61
6 changed files with 14 additions and 0 deletions
|
@ -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" ),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue