|
|
|
@ -138,7 +138,7 @@ PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& confi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
|
|
|
|
|
PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
|
|
|
|
|
{
|
|
|
|
|
using FileSystem = FileSystem::Type;
|
|
|
|
|
switch ( defaultFsType )
|
|
|
|
@ -158,7 +158,8 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
|
|
|
|
|
case FileSystem::BitLocker:
|
|
|
|
|
#endif
|
|
|
|
|
// bad bad
|
|
|
|
|
cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
|
|
|
|
|
cWarning() << "The selected default FS" << defaultFsType << "is not suitable."
|
|
|
|
|
<< "Using ext4 instead.";
|
|
|
|
|
defaultFsType = FileSystem::Ext4;
|
|
|
|
|
break;
|
|
|
|
|
case FileSystem::Ext2:
|
|
|
|
@ -191,7 +192,8 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
|
|
|
|
|
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.";
|
|
|
|
|
cWarning() << "The selected default FS" << defaultFsType << "is not known to Calamares."
|
|
|
|
|
<< "Using ext4 instead.";
|
|
|
|
|
defaultFsType = FileSystem::Ext4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -278,7 +280,7 @@ PartitionLayout::createPartitions( Device* dev,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
auto correctFS = [d=m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
|
|
|
|
|
auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
|
|
|
|
|
|
|
|
|
|
// Create the partitions.
|
|
|
|
|
currentSector = firstSector;
|
|
|
|
|