Add debug spam to ReplacePage.cpp

main
Teo Mrnjavac 10 years ago
parent 18eb0c7b96
commit d54f314394

@ -21,6 +21,7 @@
#include "ui_ReplacePage.h" #include "ui_ReplacePage.h"
#include <core/PartitionCoreModule.h> #include <core/PartitionCoreModule.h>
#include <core/device.h>
#include <core/DeviceModel.h> #include <core/DeviceModel.h>
#include <core/partition.h> #include <core/partition.h>
#include <fs/filesystem.h> #include <fs/filesystem.h>
@ -144,6 +145,7 @@ ReplacePage::applyChanges()
void void
ReplacePage::onPartitionSelected() ReplacePage::onPartitionSelected()
{ {
cDebug() << "Partition selected in Replace page.";
if ( m_ui->partitionTreeView->currentIndex() == QModelIndex() ) if ( m_ui->partitionTreeView->currentIndex() == QModelIndex() )
{ {
updateStatus( CalamaresUtils::PartitionPartition, updateStatus( CalamaresUtils::PartitionPartition,
@ -262,8 +264,11 @@ ReplacePage::onPartitionSelected()
m_ui->bootStatusLabel->hide(); m_ui->bootStatusLabel->hide();
m_ui->bootStatusLabel->clear(); m_ui->bootStatusLabel->clear();
cDebug() << "isEfi:" << m_isEfi;
if ( m_isEfi ) if ( m_isEfi )
{ {
cDebug() << "Assuming there should be an EFI System Partition somewhere...";
cDebug() << "m_efiSystemPartitions.count() is" << m_efiSystemPartitions.count();
if ( m_efiSystemPartitions.count() == 0 ) if ( m_efiSystemPartitions.count() == 0 )
{ {
updateStatus( CalamaresUtils::Fail, updateStatus( CalamaresUtils::Fail,
@ -322,6 +327,7 @@ ReplacePage::onPartitionSelected()
} }
else else
{ {
cDebug() << "System is NOT EFI, bootloader will be installed on MBR.";
updateStatus( CalamaresUtils::PartitionPartition, updateStatus( CalamaresUtils::PartitionPartition,
tr( "<strong>%3</strong><br/><br/>" tr( "<strong>%3</strong><br/><br/>"
"%1 will be installed on %2.<br/>" "%1 will be installed on %2.<br/>"
@ -421,6 +427,7 @@ ReplacePage::onPartitionModelReset()
void void
ReplacePage::loadEfiSystemPartitions() ReplacePage::loadEfiSystemPartitions()
{ {
cDebug() << "Searching for partitions of type EFI System Partition on all disks.";
m_efiSystemPartitions.clear(); m_efiSystemPartitions.clear();
m_ui->bootComboBox->hide(); m_ui->bootComboBox->hide();
m_ui->bootComboBox->clear(); m_ui->bootComboBox->clear();
@ -430,8 +437,10 @@ ReplacePage::loadEfiSystemPartitions()
QList< Device* > devices; QList< Device* > devices;
for ( int row = 0; row < m_core->deviceModel()->rowCount(); ++row ) for ( int row = 0; row < m_core->deviceModel()->rowCount(); ++row )
{ {
devices.append( m_core->deviceModel()->deviceForIndex( Device* device = m_core->deviceModel()->deviceForIndex(
m_core->deviceModel()->index( row ) ) ); m_core->deviceModel()->index( row ) );
devices.append( device );
cDebug() << "Will look in device" << device->deviceNode();
} }
//FIXME: Unfortunately right now we have to call sgdisk manually because //FIXME: Unfortunately right now we have to call sgdisk manually because
@ -443,6 +452,7 @@ ReplacePage::loadEfiSystemPartitions()
[]( Partition* partition ) -> bool []( Partition* partition ) -> bool
{ {
QProcess process; QProcess process;
cDebug() << "sgdisk checking partition type for" << partition->partitionPath();
process.setProgram( "sgdisk" ); process.setProgram( "sgdisk" );
process.setArguments( { "-i", process.setArguments( { "-i",
QString::number( partition->number() ), QString::number( partition->number() ),
@ -453,7 +463,10 @@ ReplacePage::loadEfiSystemPartitions()
{ {
if ( process.readAllStandardOutput() if ( process.readAllStandardOutput()
.contains( "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" ) ) .contains( "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" ) )
{
cDebug() << "SUCCESS! Adding" << partition->partitionPath() << "to efiSystemPartitions list.";
return true; return true;
}
} }
return false; return false;
} ); } );

Loading…
Cancel
Save