[neon/neon/calamares-settings/Neon/unstable] /: tidy up user modules

[Carlos De Maine]

Git commit 605280417434536d4e5b4cad66ecbe58acc2e7e4 by Carlos De Maine.
Committed on 20/02/2026 at 01:21.
Pushed by carlosdem into branch 'Neon/unstable'.

tidy up user modules

M  +3    -2    desktop/calamares/desktop/modules/users.conf
M  +4    -9    oem-prepare/calamares/oem-prepare/modules/users.conf

https://invent.kde.org/neon/neon/calamares-settings/-/commit/605280417434536d4e5b4cad66ecbe58acc2e7e4

diff --git a/desktop/calamares/desktop/modules/users.conf b/desktop/calamares/desktop/modules/users.conf
index 3dd20ce..4e8775b 100644
--- a/desktop/calamares/desktop/modules/users.conf
+++ b/desktop/calamares/desktop/modules/users.conf
@@ -20,6 +20,9 @@ defaultGroups:
       system: true
     - name: sudo
       must_exist: true
+# disable autologin, user can enable in systemsettings post install
+displayAutologin: false
+doAutologin: false
 # These are requirements the try to follow the suggestions from
 # https://pages.nist.gov/800-63-3/sp800-63b.html , "Digital Identity Guidelines".
 # but we allow it to be overridden
@@ -34,8 +37,6 @@ passwordRequirements:
           - badwords=linux
       allowWeakPasswords: true
       allowWeakPasswordsDefault: false
-displayAutologin: true
-doAutologin: false
 # Explicitly set the shell instead of deferring to calamares. We have a platform
 # expectation derived from ubuntu here.
 user:
diff --git a/oem-prepare/calamares/oem-prepare/modules/users.conf b/oem-prepare/calamares/oem-prepare/modules/users.conf
index 2750de7..116f616 100644
--- a/oem-prepare/calamares/oem-prepare/modules/users.conf
+++ b/oem-prepare/calamares/oem-prepare/modules/users.conf
@@ -20,6 +20,9 @@ defaultGroups:
       system: true
     - name: sudo
       must_exist: true
+# disable autologin, user can enable in systemsettings post install
+displayAutologin: false
+doAutologin: false
 # These are requirements the try to follow the suggestions from
 # https://pages.nist.gov/800-63-3/sp800-63b.html , "Digital Identity Guidelines".
 # but we allow it to be overridden
@@ -34,15 +37,7 @@ defaultGroups:
 #         - badwords=linux
 #     allowWeakPasswords: true
 #     allowWeakPasswordsDefault: false
-displayAutologin: true
-doAutologin: false
-# Explicitly set the shell instead of deferring to calamares. We have a platform
-# expectation derived from ubuntu here.
-user:
-  shell: /bin/bash
-  forbidden_names: [ root ]
-displayAutologin: true
-doAutologin: false
+
 # Explicitly set the shell instead of defering to calamares. We have a platform
 # expectation derived from ubuntu here.
 user: