applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 11:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Set FS type explicitly if no layout is given

Browse source 
- the "simple" constructor for PartitionEntry left the FS type
  set as the constructor left it -- which is Unknown by default.
  This leads to install failures in systems that don't set a
  special layout but just want a single / -- because the FS is
  set to Unknown.
- massage the constructor and consumer of the code, push
  Ext4 FS in the tests and use the configured default in production.
This commit is contained in:
Adriaan de Groot 2020-11-02 16:01:10 +01:00
parent f78752303b
commit 23eabd74c6
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/partition/tests/CreateLayoutsTests.cpp
View file

@ -59,7 +59,7 @@ CreateLayoutsTests::testFixedSizePartition()
PartitionRole role( PartitionRole::Role::Any );
QList< Partition* > partitions;
if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "5MiB" ) } ) )
{
QFAIL( qPrintable( "Unable to create / partition" ) );
}
@ -79,7 +79,7 @@ CreateLayoutsTests::testPercentSizePartition()
PartitionRole role( PartitionRole::Role::Any );
QList< Partition* > partitions;
if ( !layout.addEntry( { QString( "/" ), QString( "50%" ) } ) )
if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "50%" ) } ) )
{
QFAIL( qPrintable( "Unable to create / partition" ) );
}
@ -99,17 +99,17 @@ CreateLayoutsTests::testMixedSizePartition()
PartitionRole role( PartitionRole::Role::Any );
QList< Partition* > partitions;
if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "5MiB" ) } ) )
{
QFAIL( qPrintable( "Unable to create / partition" ) );
}
if ( !layout.addEntry( { QString( "/home" ), QString( "50%" ) } ) )
if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/home" ), QString( "50%" ) } ) )
{
QFAIL( qPrintable( "Unable to create /home partition" ) );
}
if ( !layout.addEntry( { QString( "/bkup" ), QString( "50%" ) } ) )
if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/bkup" ), QString( "50%" ) } ) )
{
QFAIL( qPrintable( "Unable to create /bkup partition" ) );
}
@ -124,7 +124,7 @@ CreateLayoutsTests::testMixedSizePartition()
}
#ifdef WITH_KPMCORE4API
// TODO: Get a clean way to instanciate a test Device from KPMCore
// TODO: Get a clean way to instantiate a test Device from KPMCore
class DevicePrivate
{
public: