From 72082588f69a7d54c20105d511f1ee71320f043a Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 3 Nov 2025 21:14:56 +0100 Subject: [PATCH] system-local-login: move pam_gnome_keyring after system-login if systemd We previously moved pam_gnome_keyring before system-login to fix an issue when using OpenRC (bug #964268). However, having pam_gnome_keyring before system-login, and thereby before pam_systemd, breaks automatic keyring unlock via pam_gnome_keyring on systemd systems (bug #964306). This adjusts the ninja template so that pam_gnome_keyring is only before system-login if --openrc is provided. Otherwise, pam_gnome_keyring is placed after system-login, just as it was before a507d2e4bf70 ("system-local-login: move pam_gnome_keyring before system-login"). Thanks to Christopher Head for reporting this. Closes: https://bugs.gentoo.org/964306 Signed-off-by: Florian Schmaus --- templates/system-local-login.tpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/system-local-login.tpl b/templates/system-local-login.tpl index 5e01090..b1bd7e7 100644 --- a/templates/system-local-login.tpl +++ b/templates/system-local-login.tpl @@ -7,7 +7,10 @@ password include system-login {% if gnome_keyring %} password optional pam_gnome_keyring.so use_authtok {% endif %} -{% if gnome_keyring %} +{% if gnome_keyring and openrc %} session optional pam_gnome_keyring.so auto_start {% endif %} session include system-login +{% if gnome_keyring and not openrc %} +session optional pam_gnome_keyring.so auto_start +{% endif %}