applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make everything obey the default filesystem type setting.

Browse source
This commit is contained in:
Teo Mrnjavac 2016-06-10 15:22:21 +02:00
parent 6fa467715c
commit f5ff716369
3 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/partition/gui/ChoicePage.cpp
View file

@ -85,6 +85,12 @@ ChoicePage::ChoicePage( QWidget* parent )
{
setupUi( this );
m_defaultFsType = Calamares::JobQueue::instance()->
globalStorage()->
value( "defaultFileSystemType" ).toString();
if ( FileSystem::typeForName( m_defaultFsType ) == FileSystem::Unknown )
m_defaultFsType = "ext4";
// Set up drives combo
m_mainLayout->setDirection( QBoxLayout::TopToBottom );
m_drivesLayout->setDirection( QBoxLayout::LeftToRight );
@ -574,7 +580,7 @@ ChoicePage::doAlongsideApply()
candidate->parent(),
*dev,
candidate->roles(),
FileSystem::Ext4,
FileSystem::typeForName( m_defaultFsType ),
newLastSector + 2, // *
oldLastSector
);
@ -585,7 +591,7 @@ ChoicePage::doAlongsideApply()
candidate->parent(),
*dev,
candidate->roles(),
FileSystem::Ext4,
FileSystem::typeForName( m_defaultFsType ),
newLastSector + 2, // *
oldLastSector,
luksPassphrase
@ -649,7 +655,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
newParent,
*selectedDevice(),
newRoles,
FileSystem::Ext4,
FileSystem::typeForName( m_defaultFsType ),
selectedPartition->firstSector(),
selectedPartition->lastSector(),
m_encryptWidget->passphrase() );
@ -660,7 +666,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
newParent,
*selectedDevice(),
newRoles,
FileSystem::Ext4,
FileSystem::typeForName( m_defaultFsType ),
selectedPartition->firstSector(),
selectedPartition->lastSector() );
}