Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
07b6b1265b | ||
![]() |
973f6935e4 |
@@ -144,8 +144,11 @@ AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osprob
|
||||
}
|
||||
// End MBR primary limit check.
|
||||
|
||||
cDebug() << "Devices with limit reached:" << pathsOfDevicesWithPrimariesLimitReached;
|
||||
cDebug() << "Osprober entries:";
|
||||
foreach ( const OsproberEntry& e, osproberEntries )
|
||||
{
|
||||
cDebug() << " *" << e.path << e.line;
|
||||
// TODO 2.0: move this to a Utils namespace.
|
||||
bool cantCreatePartitions = false;
|
||||
foreach ( const QString& devicePath, pathsOfDevicesWithPrimariesLimitReached )
|
||||
|
@@ -130,6 +130,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
|
||||
pathsOfDevicesWithPrimariesLimitReached.append( dev->deviceNode() );
|
||||
}
|
||||
}
|
||||
cDebug() << "Devices with limit reached:" << pathsOfDevicesWithPrimariesLimitReached;
|
||||
|
||||
if ( osproberEntries.count() == 0 )
|
||||
{
|
||||
@@ -271,7 +272,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( !cantCreatePartitions )
|
||||
if ( entry.canBeResized && !cantCreatePartitions )
|
||||
{
|
||||
atLeastOneCanCreatePartitions = true;
|
||||
break;
|
||||
@@ -309,7 +310,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
|
||||
string( Calamares::Branding::ShortVersionedName ) ) );
|
||||
)
|
||||
|
||||
if ( !atLeastOneCanBeResized )
|
||||
if ( !( atLeastOneCanBeResized && atLeastOneCanCreatePartitions ) )
|
||||
alongsideButton->hide();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user