From: wurt--- via Guix-patches via <guix-patches@gnu.org>
To: 63955@debbugs.gnu.org
Cc: "Carlos Durán Domínguez" <wurt@wurtshell.com>
Subject: [bug#63955] [PATCH 3/5] services: pam-mount: Fix pam-gnupg incompatibility.
Date: Thu, 8 Jun 2023 17:14:37 +0200 [thread overview]
Message-ID: <20230608151438.1280-3-wurt@wurtshell.com> (raw)
In-Reply-To: <20230608151438.1280-1-wurt@wurtshell.com>
From: Carlos Durán Domínguez <wurt@wurtshell.com>
---
gnu/services/pam-mount.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm
index 21c34ddd61..1900c44a86 100644
--- a/gnu/services/pam-mount.scm
+++ b/gnu/services/pam-mount.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2023 Carlos Durán Domínguez <wurt@wurtshell.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -17,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services pam-mount)
+ #:use-module (guix utils)
#:use-module (gnu packages admin)
#:use-module (gnu services)
#:use-module (gnu services configuration)
@@ -96,10 +98,12 @@ (module #~(string-append #$pam-mount "/lib/security/pam_mount.so"))))
'("login" "greetd" "su" "slim" "gdm-password" "sddm"))
(pam-service
(inherit pam)
- (auth (append (pam-service-auth pam)
- (list optional-pam-mount)))
- (session (append (pam-service-session pam)
- (list optional-pam-mount))))
+ (auth (insert-before pam-gnupg-module?
+ (pam-service-auth pam)
+ (list optional-pam-mount)))
+ (session (insert-before pam-gnupg-module?
+ (pam-service-session pam)
+ (list optional-pam-mount))))
pam))))))
(define pam-mount-service-type
--
2.40.1
next prev parent reply other threads:[~2023-06-08 15:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 17:13 [bug#63955] [PATCH 0/5] Add pam-gnupg support for Greetd wurt--- via Guix-patches via
2023-06-08 15:14 ` [bug#63955] [PATCH 1/5] utils: Add insert-before wurt--- via Guix-patches via
2023-06-08 15:14 ` [bug#63955] [PATCH 2/5] system: pam: Add pam-gnupg-module? wurt--- via Guix-patches via
2023-06-08 15:14 ` wurt--- via Guix-patches via [this message]
2023-06-08 15:14 ` [bug#63955] [PATCH 4/5] services: greetd: Add pam-gnupg support wurt--- via Guix-patches via
2023-06-08 15:14 ` [bug#63955] [PATCH 5/5] system: pam: Fix unix pam module order wurt--- via Guix-patches via
2023-08-31 7:43 ` bug#63955: (no subject) guix-patches--- via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230608151438.1280-3-wurt@wurtshell.com \
--to=guix-patches@gnu.org \
--cc=63955@debbugs.gnu.org \
--cc=wurt@wurtshell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).