diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp index 17c16a472..ec350a6c6 100644 --- a/src/modules/netinstall/NetInstallPage.cpp +++ b/src/modules/netinstall/NetInstallPage.cpp @@ -66,14 +66,14 @@ NetInstallPage::onActivate() // The NetInstallSelect global storage value can be used to make additional items selected by default Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - const QStringList selectNames = gs->value( "NetinstallSelect" ).toStringList(); + const QStringList selectNames = gs->value( "netinstallSelect" ).toStringList(); if ( !selectNames.isEmpty() ) { m_config->model()->setSelections( selectNames ); } // If NetInstallAdd is found in global storage, add those items to the tree - const QVariantList groups = gs->value( "NetinstallAdd" ).toList(); + const QVariantList groups = gs->value( "netinstallAdd" ).toList(); if ( !groups.isEmpty() ) { m_config->model()->appendModelData( groups ); diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp index ffe816f17..c6f5c9658 100644 --- a/src/modules/packagechooser/Config.cpp +++ b/src/modules/packagechooser/Config.cpp @@ -132,7 +132,7 @@ Config::updateGlobalStorage( const QStringList& selected ) const } else { - Calamares::JobQueue::instance()->globalStorage()->insert( "NetinstallAdd", netinstallDataList ); + Calamares::JobQueue::instance()->globalStorage()->insert( "netinstallAdd", netinstallDataList ); } } else if ( m_method == PackageChooserMethod::NetSelect ) @@ -142,9 +142,9 @@ Config::updateGlobalStorage( const QStringList& selected ) const auto* gs = Calamares::JobQueue::instance()->globalStorage(); // If an earlier packagechooser instance added this data to global storage, combine them - if ( gs->contains( "NetinstallSelect" ) ) + if ( gs->contains( "netinstallSelect" ) ) { - auto selectedOrig = gs->value( "NetinstallSelect" ); + auto selectedOrig = gs->value( "netinstallSelect" ); if ( selectedOrig.canConvert( QVariant::StringList ) ) { newSelected += selectedOrig.toStringList(); @@ -153,9 +153,9 @@ Config::updateGlobalStorage( const QStringList& selected ) const { cWarning() << "Invalid NetinstallSelect data in global storage. Earlier selections purged"; } - gs->remove( "NetinstallSelect" ); + gs->remove( "netinstallSelect" ); } - gs->insert( "NetinstallSelect", newSelected ); + gs->insert( "netinstallSelect", newSelected ); } else {