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

[partition] Obtain flag name from KPMCore

Browse Source 
- makes the displayed flag name consistent between dialog and
  pop-up and debug-messages.
This commit is contained in:
Adriaan de Groot 2022-03-14 16:45:56 +01:00
parent 1a6fb1c3d2
commit 20c44ff99a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,6 +459,8 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
return false; return false;
} }
const QString biosFlagName = PartitionTable::flagName( KPM_PARTITION_FLAG( BiosGrub ) );
auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() ); auto [ r, device ] = core->bootLoaderModel()->findBootLoader( core->bootLoaderInstallPath() );
Q_UNUSED( r ); Q_UNUSED( r );
if ( device ) if ( device )
@ -476,12 +478,12 @@ shouldWarnForGPTOnBIOS( const PartitionCoreModule* core )
&& ( partition->capacity() >= 8_MiB ) ) && ( 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"; << "is a suitable" << biosFlagName << "partition";
return false; return false;
} }
} }
} }
cDebug() << Logger::SubEntry << "No suitable partition for bios_grub found"; cDebug() << Logger::SubEntry << "No suitable partition for" << biosFlagName << "found";
} }
else else
{ {
@ -587,6 +589,7 @@ PartitionViewStep::onLeave()
if ( shouldWarnForGPTOnBIOS( m_core ) ) if ( shouldWarnForGPTOnBIOS( m_core ) )
{ {
const QString biosFlagName = PartitionTable::flagName( KPM_PARTITION_FLAG( BiosGrub ) );
QString message = tr( "Option to use GPT on BIOS" ); QString message = tr( "Option to use GPT on BIOS" );
QString description = tr( "A GPT partition table is the best option for all " QString description = tr( "A GPT partition table is the best option for all "
"systems. This installer supports such a setup for " "systems. This installer supports such a setup for "
@ -596,10 +599,10 @@ PartitionViewStep::onLeave()
"(if not done so already) go back " "(if not done so already) go back "
"and set the partition table to GPT, next create a 8 MB " "and set the partition table to GPT, next create a 8 MB "
"unformatted partition with the " "unformatted partition with the "
"<strong>bios_grub</strong> flag enabled.<br/><br/>" "<strong>%2</strong> flag enabled.<br/><br/>"
"An unformatted 8 MB partition is necessary " "An unformatted 8 MB partition is necessary "
"to start %1 on a BIOS system with GPT." ) "to start %1 on a BIOS system with GPT." )
.arg( branding->shortProductName() ); .arg( branding->shortProductName(), biosFlagName );
QMessageBox mb( QMessageBox mb(
QMessageBox::Information, message, description, QMessageBox::Ok, m_manualPartitionPage ); QMessageBox::Information, message, description, QMessageBox::Ok, m_manualPartitionPage );