diff --git a/CHANGES-3.3 b/CHANGES-3.3 index 3a1c8fe293fef02784614b75a1beb59b7ef5db93..73caf414b80ea3481442439585f25fa4df9195fa 100644 --- a/CHANGES-3.3 +++ b/CHANGES-3.3 @@ -10,13 +10,15 @@ the history of the 3.2 series (2018-05 - 2022-08). # 3.3.14 (unreleased) This release contains contributions from (alphabetically by given name): - - Nobody yet! + - vincent PENVERN ## Core ## - Nothing yet! ## Modules ## - - Nothing yet! + - *partition* module stores a global storage value in luksPassphrase, + for later modules that need to manipulate the encrypted partition. + (thanks vincent, #2424) # 3.3.13 (2024-12-31) diff --git a/src/modules/README.md b/src/modules/README.md index 86aa4d726dd94b83ca5d098b2bda39c5ba983c45..e4e56787c06135a832c991115b56cbd28f730531 100644 --- a/src/modules/README.md +++ b/src/modules/README.md @@ -198,6 +198,7 @@ efiSystemPartition|partition |bootloader, fstab|String containing the path extraMounts |mount |unpackfs|List of maps holding metadata for the temporary mountpoints used by the installer fullname |users | |The full username (e.g. "Jane Q. Public") hostname |users | |A string containing the hostname of the new system +luksPassphrase |partition | |Obfuscated passphrase used on luks partition netinstallAdd |packagechooser |netinstall |Data to add to netinstall tree. Same format as netinstall.yaml netinstallSelect |packagechooser |netinstall |List of group names to select in the netinstall tree packageOperations +|packagechooser, netinstall|packages|Operations to perform diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 26b6ca651b78f366b5dfd9528f172dca74954129..06bd2ab531b450aa472f5efa509ee2a5d62f6ab5 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -695,7 +695,7 @@ ChoicePage::onLeave() const bool useLuksPassphrase = ( m_encryptWidget->state() == EncryptWidget::Encryption::Confirmed ); const QString storedLuksPassphrase = useLuksPassphrase ? Calamares::String::obscure( m_encryptWidget->passphrase() ) : Qstring(); - gs->insert( "passphrase", storedLuksPassphrase ); + gs->insert( "luksPassphrase", storedLuksPassphrase ); if ( m_config->installChoice() == InstallChoice::Alongside ) {