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

[partition] Introduce a check if the GPT-on-BIOS popup should be shown

Browse Source 
The check is bogus right now, and it still always warns; but if
the `shouldWarnForGPTOnBIOS()` function is implemented, this will
fix issue 1701.
This commit is contained in:
Adriaan de Groot 2021-05-25 10:47:05 +02:00
parent ded7991dd6
commit d630c2aadf
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,6 +395,18 @@ PartitionViewStep::onActivate()
}
}
static bool
shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
{
if ( PartUtils::isEfiSystem() )
{
return false;
}
cDebug() << core->bootLoaderInstallPath();
return true;
}
void
PartitionViewStep::onLeave()
@ -462,9 +474,9 @@ PartitionViewStep::onLeave()
{
cDebug() << "device: BIOS";
// TODO: this *always* warns, which might be annoying, so it'd be
// best to find a way to detect that bios_grub partition.
if ( shouldWarnForGPTOnBIOS( m_core ) )
{
QString message = tr( "Option to use GPT on BIOS" );
QString description = tr( "A GPT partition table is the best option for all "
"systems. This installer supports such a setup for "
@ -481,6 +493,7 @@ PartitionViewStep::onLeave()
QMessageBox::information( m_manualPartitionPage, message, description );
}
}
Partition* root_p = m_core->findPartitionByMountPoint( "/" );
Partition* boot_p = m_core->findPartitionByMountPoint( "/boot" );
@ -593,7 +606,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;