applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 18:05:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor check for EFI system.

Browse source 
The TODO stands, to delegate this to KPMCore.
This commit is contained in:
Adriaan de Groot 2017-08-28 05:36:21 -04:00
parent 106f18e074
commit 7e66499f36
10 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/partition/gui/ChoicePage.cpp
View file

@ -146,7 +146,7 @@ void
ChoicePage::init( PartitionCoreModule* core )
{
m_core = core;
m_isEfi = QDir( "/sys/firmware/efi/efivars" ).exists();
m_isEfi = PartUtils::isEfiSystem();
setupChoices();
@ -680,7 +680,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
m_core->revertDevice( selectedDevice() );
}
// if the partition is unallocated(free space), we don't replace it but create new one
// if the partition is unallocated(free space), we don't replace it but create new one
// with the same first and last sector
Partition* selectedPartition =
static_cast< Partition* >( current.data( PartitionModel::PartitionPtrRole )
@ -1311,7 +1311,7 @@ ChoicePage::setupActions()
m_grp->setExclusive( true );
}
bool isEfi = QDir( "/sys/firmware/efi/efivars" ).exists();
bool isEfi = PartUtils::isEfiSystem();
bool efiSystemPartitionFound = !m_core->efiSystemPartitions().isEmpty();
if ( isEfi && !efiSystemPartitionFound )