From 3cf89c92aba18864e9b7c307cea9de5692fa23ba Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sun, 10 Mar 2024 18:20:39 -0500 Subject: [PATCH] Actually enforce non-empty passwords --- debian/changelog | 5 +++++ kubuntu/modules/users.conf | 5 ++--- kubuntu/modules/users.conf.oem | 5 ++--- kubuntu/oem/modules/users.conf | 5 ++--- lubuntu/modules/users.conf | 5 ++--- lubuntu/modules/users.conf.oem | 5 ++--- lubuntu/oem/modules/users.conf | 5 ++--- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c10a5d..e5026dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,11 @@ calamares-settings-ubuntu (1:24.04.17) noble; urgency=medium [ Aaron Rainbolt ] * Wipe Ubuntu Studio's configuration while preserving branding, Studio now uses ubuntu-desktop-provision. + * Migrate from users.conf password setting "nonEmpty: true" to + "minLength: 1" to enforce non-empty passwords. + - This is not a new feature, we had non-empty passwords being enforced in + the past and didn't intentionally undo this, but Calamares dropped the + "nonEmpty: true" setting we were using. -- Aaron Rainbolt Sun, 10 Mar 2024 18:10:03 -0500 diff --git a/kubuntu/modules/users.conf b/kubuntu/modules/users.conf index 575104b..cc11f7f 100644 --- a/kubuntu/modules/users.conf +++ b/kubuntu/modules/users.conf @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: diff --git a/kubuntu/modules/users.conf.oem b/kubuntu/modules/users.conf.oem index 78b0a3c..3c6e8e7 100644 --- a/kubuntu/modules/users.conf.oem +++ b/kubuntu/modules/users.conf.oem @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: diff --git a/kubuntu/oem/modules/users.conf b/kubuntu/oem/modules/users.conf index 575104b..cc11f7f 100644 --- a/kubuntu/oem/modules/users.conf +++ b/kubuntu/oem/modules/users.conf @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: diff --git a/lubuntu/modules/users.conf b/lubuntu/modules/users.conf index 575104b..cc11f7f 100644 --- a/lubuntu/modules/users.conf +++ b/lubuntu/modules/users.conf @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: diff --git a/lubuntu/modules/users.conf.oem b/lubuntu/modules/users.conf.oem index 78b0a3c..3c6e8e7 100644 --- a/lubuntu/modules/users.conf.oem +++ b/lubuntu/modules/users.conf.oem @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: diff --git a/lubuntu/oem/modules/users.conf b/lubuntu/oem/modules/users.conf index 575104b..cc11f7f 100644 --- a/lubuntu/oem/modules/users.conf +++ b/lubuntu/oem/modules/users.conf @@ -13,9 +13,8 @@ defaultGroups: system: true - sudo passwordRequirements: - nonempty: true - minLength: 0 - maxLength: 0 + minLength: 1 + maxLength: -1 # Explicitly set the shell instead of deferring to Calamares. We have a platform # expectation derived from Ubuntu here. user: