From 37a3f41da6fa3136c46c9d76a18ad36f4f680303 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 11 Oct 2020 20:57:19 +0000 Subject: templates/system-login.tpl: move systemd, elogind blocks here Signed-off-by: Sam James --- templates/system-auth.tpl | 8 -------- templates/system-login.tpl | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/system-auth.tpl b/templates/system-auth.tpl index 46fc131..f8484f1 100644 --- a/templates/system-auth.tpl +++ b/templates/system-auth.tpl @@ -47,14 +47,6 @@ password optional pam_permit.so session optional pam_ssh.so {% endif %} -{% if systemd %} --session optional pam_systemd.so -{% endif %} - -{% if elogind %} --session optional pam_elogind.so -{% endif %} - {% if libcap %} -session optional pam_libcap.so {% endif %} diff --git a/templates/system-login.tpl b/templates/system-login.tpl index 99801a1..889c2d7 100644 --- a/templates/system-login.tpl +++ b/templates/system-login.tpl @@ -32,3 +32,11 @@ session optional pam_motd.so motd=/etc/motd {% if not minimal %} session optional pam_mail.so {% endif %} + +{% if systemd %} +-session optional pam_systemd.so +{% endif %} + +{% if elogind %} +-session optional pam_elogind.so +{% endif %} -- cgit v1.2.3-65-gdbad