|
|
@ -462,7 +462,7 @@ ChoicePage::applyActionChoice( ChoicePage::InstallChoice choice )
|
|
|
|
gs->value( "defaultFileSystemType" ).toString(),
|
|
|
|
gs->value( "defaultFileSystemType" ).toString(),
|
|
|
|
m_encryptWidget->passphrase(),
|
|
|
|
m_encryptWidget->passphrase(),
|
|
|
|
gs->value( "efiSystemPartition" ).toString(),
|
|
|
|
gs->value( "efiSystemPartition" ).toString(),
|
|
|
|
CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGB" ).toDouble() ),
|
|
|
|
CalamaresUtils::GiBtoBytes( gs->value( "requiredStorageGiB" ).toDouble() ),
|
|
|
|
m_eraseSwapChoice
|
|
|
|
m_eraseSwapChoice
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
@ -560,7 +560,7 @@ ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
|
|
|
|
|
|
|
|
|
|
|
|
double requiredStorageGB = Calamares::JobQueue::instance()
|
|
|
|
double requiredStorageGB = Calamares::JobQueue::instance()
|
|
|
|
->globalStorage()
|
|
|
|
->globalStorage()
|
|
|
|
->value( "requiredStorageGB" )
|
|
|
|
->value( "requiredStorageGiB" )
|
|
|
|
.toDouble();
|
|
|
|
.toDouble();
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: make this consistent
|
|
|
|
// TODO: make this consistent
|
|
|
|