From e5a20fbf310497fcdee32d27af48b31c84d3e3b1 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sun, 16 Feb 2025 18:01:10 -0600 Subject: [PATCH] Fix some of the confusion around the weak password checkbox and its visibility. --- debian/changelog | 7 +++++++ .../patches/fix-checkbox-warning-confusion.patch | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) create mode 100644 debian/patches/fix-checkbox-warning-confusion.patch diff --git a/debian/changelog b/debian/changelog index 68884ea..9c20f52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 16 Feb 2025 17:50:18 -0600 + calamares (3.3.13-0ubuntu3) plucky; urgency=medium * No-change rebuild for icu soname change. diff --git a/debian/patches/fix-checkbox-warning-confusion.patch b/debian/patches/fix-checkbox-warning-confusion.patch new file mode 100644 index 0000000..7b6f03b --- /dev/null +++ b/debian/patches/fix-checkbox-warning-confusion.patch @@ -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() ); diff --git a/debian/patches/series b/debian/patches/series index 88d5c36..86f0e2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ apport-package-hook.patch enable-only-present-with-encryption-partitions.patch grub-debconf-config.patch unmount-encrypted-devices.patch +fix-checkbox-warning-confusion.patch