napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Be more verbose about default file-system settings

Browse Source 
- Log the type that is configured
 - Document that this is a delicate setting, case-sensitive and
   dependent on KPMCore.
This commit is contained in:
Adriaan de Groot 2018-11-06 05:54:45 -05:00
parent 417eeedd9f
commit 463b1441a5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -574,6 +574,8 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" ); QString defaultFS = CalamaresUtils::getString( configurationMap, "defaultFileSystemType" );
if ( defaultFS.isEmpty() ) if ( defaultFS.isEmpty() )
defaultFS = QStringLiteral( "ext4" ); defaultFS = QStringLiteral( "ext4" );
else
cDebug() << "Partition-module setting *defaultFileSystemType*" << defaultFS;
if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown ) if ( FileSystem::typeForName( defaultFS ) == FileSystem::Unknown )
{ {
cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4."; cWarning() << "Partition-module setting *defaultFileSystemType* is bad (" << defaultFS << ") using ext4.";

2
src/modules/partition/partition.conf
View File

@ -53,6 +53,8 @@ alwaysShowPartitionLabels: true
# #
# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs # Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
# If nothing is specified, Calamares defaults to "ext4". # If nothing is specified, Calamares defaults to "ext4".
#
# Names are case-sensitive and defined by KPMCore.
defaultFileSystemType: "ext4" defaultFileSystemType: "ext4"
# Show/hide LUKS related functionality in automated partitioning modes. # Show/hide LUKS related functionality in automated partitioning modes.