applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 10:55:37 -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

9
src/modules/partition/core/PartitionLayout.h
View file

@ -44,8 +44,13 @@ public:
/// @brief All-zeroes PartitionEntry
PartitionEntry();
/// @brief Parse @p mountPoint, @p size, @p minSize and @p maxSize to their respective member variables
PartitionEntry( const QString& mountPoint,
/** @brief Parse @p mountPoint, @p size, @p minSize and @p maxSize to their respective member variables
*
* Sets a specific FS type (not parsed from string like the other
* constructor).
*/
PartitionEntry( FileSystem::Type type,
const QString& mountPoint,
const QString& size,
const QString& minSize = QString(),
const QString& maxSize = QString() );