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

Add a "do not install boot loader" value to the boot loader picker.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-07-07 19:16:22 +02:00
parent 8c537daadc
commit 881bf67d22
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/partition/core/BootLoaderModel.cpp
View File

@ -66,6 +66,9 @@ BootLoaderModel::createMbrItems()
void
BootLoaderModel::update()
{
clear();
createMbrItems();
QString partitionText;
Partition* partition = PMUtils::findPartitionByMountPoint( m_devices, "/boot" );
if ( partition )
@ -86,19 +89,25 @@ BootLoaderModel::update()
{
if ( lastIsPartition )
takeRow( rowCount() - 1 );
return;
}
QString mountPoint = PartitionInfo::mountPoint( partition );
if ( lastIsPartition )
{
last->setText( partitionText );
last->setData( mountPoint, BootLoaderPathRole );
}
else
{
QString mountPoint = PartitionInfo::mountPoint( partition );
if ( lastIsPartition )
{
last->setText( partitionText );
last->setData( mountPoint, BootLoaderPathRole );
}
else
{
appendRow(
createBootLoaderItem( partitionText, PartitionInfo::mountPoint( partition ), true )
);
}
// Create "don't install bootloader" item
appendRow(
createBootLoaderItem( partitionText, PartitionInfo::mountPoint( partition ), true )
createBootLoaderItem( tr( "Do not install a boot loader" ), QString(), false )
);
}
}
@ -108,9 +117,14 @@ QVariant
BootLoaderModel::data( const QModelIndex& index, int role ) const
{
if ( role == Qt::DisplayRole )
{
if ( QStandardItemModel::data( index, BootLoaderModel::BootLoaderPathRole ).toString().isEmpty() )
return QStandardItemModel::data( index, Qt::DisplayRole ).toString();
return tr( "%1 (%2)" )
.arg( QStandardItemModel::data( index, Qt::DisplayRole ).toString() )
.arg( QStandardItemModel::data( index, BootLoaderModel::BootLoaderPathRole ).toString() );
}
return QStandardItemModel::data( index, role );
}

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

@ -157,10 +157,17 @@ FillGlobalStorageJob::exec()
{
Calamares::GlobalStorage* storage = Calamares::JobQueue::instance()->globalStorage();
storage->insert( "partitions", createPartitionList() );
QVariant var = createBootLoaderMap();
if ( !var.isValid() )
return Calamares::JobResult::error( tr( "Failed to find path for boot loader" ) );
storage->insert( "bootLoader", var );
if ( !m_bootLoaderPath.isEmpty() )
{
QVariant var = createBootLoaderMap();
if ( !var.isValid() )
cDebug() << "Failed to find path for boot loader";
storage->insert( "bootLoader", var );
}
else
{
storage->insert( "bootLoader", QVariant() );
}
return Calamares::JobResult::ok();
}