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

[partition] Write out type rather than aliasing to T

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-05 13:11:00 +02:00
parent 7ea6768852
commit 1a542d3afe
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/PartitionViewStep.cpp
View File

@ -432,14 +432,15 @@ PartitionViewStep::onLeave()
{
if ( PartUtils::isEfiSystem() )
{
QString espMountPoint
const QString espMountPoint
= Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
const QString espFlagName = PartitionTable::flagName(
#ifdef WITH_KPMCORE4API
auto espFlag = PartitionTable::Flag::Boot;
PartitionTable::Flag::Boot
#else
auto espFlag = PartitionTable::FlagEsp;
PartitionTable::FlagEsp
#endif
QString espFlagName = PartitionTable::flagName( espFlag );
);
Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
QString message;

74
src/modules/partition/core/PartitionLayout.cpp
View File

@ -140,55 +140,55 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
void
PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
{
using T = FileSystem::Type;
using FileSystem = FileSystem::Type;
switch ( defaultFsType )
{
case T::Unknown:
case T::Unformatted:
case T::Extended:
case T::LinuxSwap:
case T::Luks:
case T::Ocfs2:
case T::Lvm2_PV:
case T::Udf:
case T::Iso9660:
case T::Luks2:
case T::LinuxRaidMember:
case T::BitLocker:
case FileSystem::Unknown:
case FileSystem::Unformatted:
case FileSystem::Extended:
case FileSystem::LinuxSwap:
case FileSystem::Luks:
case FileSystem::Ocfs2:
case FileSystem::Lvm2_PV:
case FileSystem::Udf:
case FileSystem::Iso9660:
case FileSystem::Luks2:
case FileSystem::LinuxRaidMember:
case FileSystem::BitLocker:
// bad bad
cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
defaultFsType = T::Ext4;
defaultFsType = FileSystem::Ext4;
break;
case T::Ext2:
case T::Ext3:
case T::Ext4:
case T::Fat32:
case T::Ntfs:
case T::Reiser4:
case T::ReiserFS:
case T::Xfs:
case T::Jfs:
case T::Btrfs:
case T::Exfat:
case T::F2fs:
case FileSystem::Ext2:
case FileSystem::Ext3:
case FileSystem::Ext4:
case FileSystem::Fat32:
case FileSystem::Ntfs:
case FileSystem::Reiser4:
case FileSystem::ReiserFS:
case FileSystem::Xfs:
case FileSystem::Jfs:
case FileSystem::Btrfs:
case FileSystem::Exfat:
case FileSystem::F2fs:
// ok
break;
case T::Fat12:
case T::Fat16:
case T::Hfs:
case T::HfsPlus:
case T::Ufs:
case T::Hpfs:
case T::Zfs:
case T::Nilfs2:
case T::Apfs:
case T::Minix:
case FileSystem::Fat12:
case FileSystem::Fat16:
case FileSystem::Hfs:
case FileSystem::HfsPlus:
case FileSystem::Ufs:
case FileSystem::Hpfs:
case FileSystem::Zfs:
case FileSystem::Nilfs2:
case FileSystem::Apfs:
case FileSystem::Minix:
// weird
cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
break;
default:
cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares." << "Using ext4 instead.";
defaultFsType = T::Ext4;
defaultFsType = FileSystem::Ext4;
}
m_defaultFsType = defaultFsType;