|
|
|
@ -388,7 +388,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() );
|
|
|
|
|
Q_UNUSED(r);
|
|
|
|
|
Q_UNUSED( r );
|
|
|
|
|
if ( device )
|
|
|
|
|
{
|
|
|
|
|
auto* table = device->partitionTable();
|
|
|
|
@ -403,8 +403,7 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
|
|
|
|
|
&& ( partition->fileSystem().type() == FileSystem::Unformatted )
|
|
|
|
|
&& ( partition->capacity() >= 8_MiB ) )
|
|
|
|
|
{
|
|
|
|
|
cDebug() << Logger::SubEntry << "Partition" << partition->devicePath()
|
|
|
|
|
<< partition->partitionPath()
|
|
|
|
|
cDebug() << Logger::SubEntry << "Partition" << partition->devicePath() << partition->partitionPath()
|
|
|
|
|
<< "is a suitable bios_grub partition";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
@ -591,7 +590,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
|
{
|
|
|
|
|
cWarning() << "Partition-module setting *defaultFileSystemType* is missing, will use ext4";
|
|
|
|
|
}
|
|
|
|
|
QString fsRealName = PartUtils::findFS( fsName, &fsType );
|
|
|
|
|
QString fsRealName = PartUtils::canonicalFilesystemName( fsName, &fsType );
|
|
|
|
|
if ( fsRealName == fsName )
|
|
|
|
|
{
|
|
|
|
|
cDebug() << o << "Partition-module setting *defaultFileSystemType*" << fsRealName;
|
|
|
|
@ -619,7 +618,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|
|
|
|
// because it could take a while. Then when it's done, we can set up the widgets
|
|
|
|
|
// and remove the spinner.
|
|
|
|
|
m_future = new QFutureWatcher< void >();
|
|
|
|
|
connect( m_future, &QFutureWatcher< void >::finished, this, [ this ] {
|
|
|
|
|
connect( m_future, &QFutureWatcher< void >::finished, this, [this] {
|
|
|
|
|
continueLoading();
|
|
|
|
|
this->m_future->deleteLater();
|
|
|
|
|
this->m_future = nullptr;
|
|
|
|
|