[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam r
From: |
Josselin Poiret |
Subject: |
[bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux. |
Date: |
Mon, 20 Mar 2023 23:10:51 +0100 |
* gnu/system/pam.scm (pam-root-service-type): Do it.
---
gnu/system/pam.scm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm
index b635681642..8408e33c3f 100644
--- a/gnu/system/pam.scm
+++ b/gnu/system/pam.scm
@@ -20,6 +20,7 @@ (define-module (gnu system pam)
#:use-module (guix records)
#:use-module (guix derivations)
#:use-module (guix gexp)
+ #:use-module (guix utils)
#:use-module (gnu services)
#:use-module (gnu system setuid)
#:use-module (ice-9 match)
@@ -377,12 +378,15 @@ (define (extend-configuration initial extensions)
(define pam-root-service-type
(service-type (name 'pam)
(extensions
- (list (service-extension
- setuid-program-service-type
- (lambda (_)
- (list (file-like->setuid-program
- (file-append linux-pam
"/sbin/unix_chkpwd")))))
- (service-extension etc-service-type /etc-entry)))
+ (cons (service-extension etc-service-type /etc-entry)
+ (if (target-linux? (or (%current-target-system)
+ (%current-system)))
+ (list (service-extension
+ setuid-program-service-type
+ (lambda (_)
+ (list (file-like->setuid-program
+ (file-append linux-pam
"/sbin/unix_chkpwd"))))))
+ '())))
;; Arguments include <pam-service> as well as procedures.
(compose concatenate)
--
2.39.2
- [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures, (continued)
- [bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 04/15] cross-base: Factor out cross-mig., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 10/15] hurd: Remove useless glibc/hurd-headers input., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 13/15] mig/32-bit: Remove., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux.,
Josselin Poiret <=
- [bug#62307] [PATCH core-updates 05/15] cross-base: Add cross arguments to hurd derivatives., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 08/15] gnumach: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 11/15] gnumach, hurd-headers, hurd: Switch to using cross-mig., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 11/15] gnumach, hurd: Switch to using cross-mig., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 09/15] hurd: Update to 91a51672ff4cfe1f1a0712b4c542ded3081c825b., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 14/15] system: hurd: Use shepherd-0.8 in the package list., Josselin Poiret, 2023/03/20