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

[partition] Substitute in the right flag name

Browse Source 
- This uses "esp" in KPMCore 3 and "boot" in KPMCore 4
This commit is contained in:
Adriaan de Groot 2020-04-23 13:53:30 +02:00
parent 79e8c447b9
commit 479b467bb6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,6 +417,12 @@ PartitionViewStep::onLeave()
{ {
QString espMountPoint QString espMountPoint
= Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
#ifdef WITH_KPMCORE4API
auto espFlag = PartitionTable::Flag::Boot;
#else
auto espFlag = PartitionTable::FlagEsp;
#endif
QString espFlagName = PartitionTable::flagName( espFlag );
Partition* esp = m_core->findPartitionByMountPoint( espMountPoint ); Partition* esp = m_core->findPartitionByMountPoint( espMountPoint );
QString message; QString message;
@ -428,12 +434,12 @@ PartitionViewStep::onLeave()
"<br/><br/>" "<br/><br/>"
"To configure an EFI system partition, go back and " "To configure an EFI system partition, go back and "
"select or create a FAT32 filesystem with the " "select or create a FAT32 filesystem with the "
"<strong>esp</strong> flag enabled and mount point " "<strong>%3</strong> flag enabled and mount point "
"<strong>%2</strong>.<br/><br/>" "<strong>%2</strong>.<br/><br/>"
"You can continue without setting up an EFI system " "You can continue without setting up an EFI system "
"partition but your system may fail to start." ) "partition but your system may fail to start." )
.arg( *Calamares::Branding::ShortProductName ) .arg( *Calamares::Branding::ShortProductName )
.arg( espMountPoint ); .arg( espMountPoint, espFlagName );
} }
else if ( esp && !PartUtils::isEfiBootable( esp ) ) else if ( esp && !PartUtils::isEfiBootable( esp ) )
{ {
@ -441,14 +447,14 @@ PartitionViewStep::onLeave()
description = tr( "An EFI system partition is necessary to start %1." description = tr( "An EFI system partition is necessary to start %1."
"<br/><br/>" "<br/><br/>"
"A partition was configured with mount point " "A partition was configured with mount point "
"<strong>%2</strong> but its <strong>esp</strong> " "<strong>%2</strong> but its <strong>%3</strong> "
"flag is not set.<br/>" "flag is not set.<br/>"
"To set the flag, go back and edit the partition." "To set the flag, go back and edit the partition."
"<br/><br/>" "<br/><br/>"
"You can continue without setting the flag but your " "You can continue without setting the flag but your "
"system may fail to start." ) "system may fail to start." )
.arg( *Calamares::Branding::ShortProductName ) .arg( *Calamares::Branding::ShortProductName )
.arg( espMountPoint ); .arg( espMountPoint, espFlagName );
} }
if ( !message.isEmpty() ) if ( !message.isEmpty() )