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

Improve debug output for bootloader code path.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-12-02 18:36:02 +01:00 committed by Philip
parent 32402eeafa
commit 2082fff1d2
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -441,6 +441,7 @@ PartitionCoreModule::jobs() const
lst << info->jobs; lst << info->jobs;
devices << info->device.data(); devices << info->device.data();
} }
cDebug() << "Creating FillGlobalStorageJob with bootLoader path" << m_bootLoaderInstallPath;
lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) ); lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) );
@ -596,6 +597,7 @@ PartitionCoreModule::findPartitionByMountPoint( const QString& mountPoint ) cons
void void
PartitionCoreModule::setBootLoaderInstallPath( const QString& path ) PartitionCoreModule::setBootLoaderInstallPath( const QString& path )
{ {
cDebug() << "PCM::setBootLoaderInstallPath" << path;
m_bootLoaderInstallPath = path; m_bootLoaderInstallPath = path;
} }

1
src/modules/partition/gui/PartitionPage.cpp
View File

@ -291,6 +291,7 @@ PartitionPage::updateBootLoaderInstallPath()
QVariant var = m_ui->bootLoaderComboBox->currentData( BootLoaderModel::BootLoaderPathRole ); QVariant var = m_ui->bootLoaderComboBox->currentData( BootLoaderModel::BootLoaderPathRole );
if ( !var.isValid() ) if ( !var.isValid() )
return; return;
qDebug() << "PartitionPage::updateBootLoaderInstallPath" << var.toString();
m_core->setBootLoaderInstallPath( var.toString() ); m_core->setBootLoaderInstallPath( var.toString() );
} }

2
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -198,10 +198,12 @@ FillGlobalStorageJob::exec()
QVariant var = createBootLoaderMap(); QVariant var = createBootLoaderMap();
if ( !var.isValid() ) if ( !var.isValid() )
cDebug() << "Failed to find path for boot loader"; cDebug() << "Failed to find path for boot loader";
cDebug() << "FillGlobalStorageJob writing bootLoader path:" << var;
storage->insert( "bootLoader", var ); storage->insert( "bootLoader", var );
} }
else else
{ {
cDebug() << "FillGlobalStorageJob writing empty bootLoader value";
storage->insert( "bootLoader", QVariant() ); storage->insert( "bootLoader", QVariant() );
} }
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();