From 81ff2b2b87eeef7e69e5d76773a0fa7c3485da95 Mon Sep 17 00:00:00 2001 From: Sandwich Date: Sun, 22 Feb 2026 03:07:30 +0100 Subject: [PATCH] feat(global_defaults): add root.shell to system schema and normalization --- roles/configuration/tasks/users.yml | 2 +- roles/global_defaults/defaults/main.yml | 1 + roles/global_defaults/tasks/_normalize_system.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/configuration/tasks/users.yml b/roles/configuration/tasks/users.yml index 42b58e4..d952839 100644 --- a/roles/configuration/tasks/users.yml +++ b/roles/configuration/tasks/users.yml @@ -11,7 +11,7 @@ - name: Set root shell ansible.builtin.command: >- - {{ chroot_command }} /usr/sbin/usermod --shell {{ system_cfg.root.shell | default('/bin/bash') }} root + {{ chroot_command }} /usr/sbin/usermod --shell {{ system_cfg.root.shell }} root register: configuration_root_shell_result changed_when: configuration_root_shell_result.rc == 0 diff --git a/roles/global_defaults/defaults/main.yml b/roles/global_defaults/defaults/main.yml index 2678e6a..dce6e9d 100644 --- a/roles/global_defaults/defaults/main.yml +++ b/roles/global_defaults/defaults/main.yml @@ -87,6 +87,7 @@ system_defaults: users: [] root: password: "" + shell: "/bin/bash" luks: enabled: false passphrase: "" diff --git a/roles/global_defaults/tasks/_normalize_system.yml b/roles/global_defaults/tasks/_normalize_system.yml index a3a4ac6..4b5f8f2 100644 --- a/roles/global_defaults/tasks/_normalize_system.yml +++ b/roles/global_defaults/tasks/_normalize_system.yml @@ -84,6 +84,7 @@ users: "{{ system_raw.users | default([]) }}" root: password: "{{ system_raw.root.password | string }}" + shell: "{{ system_raw.root.shell | default('/bin/bash') | string }}" # --- LUKS disk encryption --- luks: enabled: "{{ system_raw.luks.enabled | bool }}"