Merge branch 'master' into requirements-checking

This commit is contained in:
Adriaan de Groot 2018-03-06 17:06:35 +01:00
commit c7629182e4
229 changed files with 20045 additions and 6562 deletions

View file

@ -428,6 +428,7 @@ PartitionViewStep::onLeave()
if ( !message.isEmpty() )
{
cWarning() << message;
QMessageBox::warning( m_manualPartitionPage,
message,
description );
@ -521,7 +522,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
gs->insert( "defaultFileSystemType", typeString );
if ( FileSystem::typeForName( typeString ) == FileSystem::Unknown )
{
cDebug() << "WARNING: bad default filesystem configuration for partition module. Reverting to ext4 as default.";
cWarning() << "bad default filesystem configuration for partition module. Reverting to ext4 as default.";
gs->insert( "defaultFileSystemType", "ext4" );
}
}