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

[partition] Don't offer /boot if EFI wants something else

Browse Source 
- Don't leave /boot in the list always; EFI might be configured
  for /boot/efi on this system
- While here, apply coding style.
This commit is contained in:
Adriaan de Groot 2021-06-18 22:20:11 +02:00
parent 6936915dd6
commit 60f8a7c5fb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/partition/gui/PartitionDialogHelpers.cpp
View File

@ -23,11 +23,15 @@
QStringList
standardMountPoints()
{
QStringList mountPoints { "/", "/boot", "/home", "/opt", "/srv", "/usr", "/var" };
QStringList mountPoints { "/", "/home", "/opt", "/srv", "/usr", "/var" };
if ( PartUtils::isEfiSystem() )
{
mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
}
else
{
mountPoints << QStringLiteral( "/boot" );
}
mountPoints.removeDuplicates();
mountPoints.sort();
return mountPoints;
@ -68,11 +72,13 @@ setSelectedMountPoint( QComboBox& combo, const QString& selected )
else
{
for ( int i = 0; i < combo.count(); ++i )
{
if ( selected == combo.itemText( i ) )
{
combo.setCurrentIndex( i );
return;
}
}
combo.addItem( selected );
combo.setCurrentIndex( combo.count() - 1 );
}
@ -85,10 +91,12 @@ flagsFromList( const QListWidget& list )
PartitionTable::Flags flags;
for ( int i = 0; i < list.count(); i++ )
{
if ( list.item( i )->checkState() == Qt::Checked )
{
flags |= static_cast< PartitionTable::Flag >( list.item( i )->data( Qt::UserRole ).toInt() );
}
}
return flags;
}