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

Only look for a separate /home partition if a partition was found.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-07-20 17:06:14 +02:00
parent d65df112dd
commit aaf85407fb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/partition/gui/ChoicePage.cpp
View File

@ -670,12 +670,6 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
m_core->revertDevice( selectedDevice() ); m_core->revertDevice( selectedDevice() );
} }
// Find out is the selected partition has a rootfs. If yes, then make the
// m_reuseHomeCheckBox visible and set its text to something meaningful.
homePartitionPath = current.data( PartitionModel::OsproberHomePartitionPathRole ).toString();
if ( homePartitionPath.isEmpty() )
doReuseHomePartition = false;
// if the partition is unallocated(free space), we don't replace it but create new one // if the partition is unallocated(free space), we don't replace it but create new one
// with the same first and last sector // with the same first and last sector
Partition* selectedPartition = Partition* selectedPartition =
@ -736,6 +730,15 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
partPath ); partPath );
if ( selectedPartition ) if ( selectedPartition )
{ {
// Find out is the selected partition has a rootfs. If yes, then make the
// m_reuseHomeCheckBox visible and set its text to something meaningful.
homePartitionPath.clear();
foreach ( const OsproberEntry& osproberEntry, m_core->osproberEntries() )
if ( osproberEntry.path == partPath )
homePartitionPath = osproberEntry.homePath;
if ( homePartitionPath.isEmpty() )
doReuseHomePartition = false;
PartitionActions::doReplacePartition( m_core, PartitionActions::doReplacePartition( m_core,
selectedDevice(), selectedDevice(),
selectedPartition, selectedPartition,