Fix some of the confusion around the weak password checkbox and its visibility.

This commit is contained in:
Simon Quigley 2025-02-16 18:01:10 -06:00
parent 96a40ef1ee
commit e5a20fbf31
3 changed files with 22 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
calamares (3.3.13-0ubuntu4) plucky; urgency=medium
* Fix some of the confusion around the weak password checkbox and its
visibility.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 16 Feb 2025 17:50:18 -0600
calamares (3.3.13-0ubuntu3) plucky; urgency=medium calamares (3.3.13-0ubuntu3) plucky; urgency=medium
* No-change rebuild for icu soname change. * No-change rebuild for icu soname change.

View File

@ -0,0 +1,14 @@
diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index be754774b..380ed293e 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -1026,8 +1026,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
m_reuseUserPasswordForRoot = Calamares::getBool( configurationMap, "doReusePassword", false );
m_permitWeakPasswords = Calamares::getBool( configurationMap, "allowWeakPasswords", false );
- m_requireStrongPasswords
- = !m_permitWeakPasswords || !Calamares::getBool( configurationMap, "allowWeakPasswordsDefault", false );
+ m_requireStrongPasswords = Calamares::getBool( configurationMap, "allowWeakPasswordsDefault", false );
// If the value doesn't exist, or isn't a map, this gives an empty map -- no problem
auto pr_checks( configurationMap.value( "passwordRequirements" ).toMap() );

View File

@ -3,3 +3,4 @@ apport-package-hook.patch
enable-only-present-with-encryption-partitions.patch enable-only-present-with-encryption-partitions.patch
grub-debconf-config.patch grub-debconf-config.patch
unmount-encrypted-devices.patch unmount-encrypted-devices.patch
fix-checkbox-warning-confusion.patch