Merge branch 'master' into requirements-checking

This commit is contained in:
Adriaan de Groot 2018-03-06 14:57:17 +01:00
commit a72bdfac52
557 changed files with 27764 additions and 17340 deletions

View file

@ -1,4 +1,4 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
@ -410,7 +410,7 @@ PartitionViewStep::onLeave()
.arg( *Calamares::Branding::ShortProductName )
.arg( espMountPoint );
}
else if ( esp && !esp->activeFlags().testFlag( PartitionTable::FlagEsp ) )
else if ( esp && !PartUtils::isEfiBootable( esp ) )
{
message = tr( "EFI system partition flag not set" );
description = tr( "An EFI system partition is necessary to start %1."