diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-06-24 21:39:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-06-24 21:39:09 +0200 |
| commit | da24d067d0954cc8f8d75fa9099ad6d8a01e1098 (patch) | |
| tree | f287391c8ebbb15df5890d6b5911128408ff438e /gnu/system/linux-container.scm | |
| parent | 909788c0aebd8098084c009afa98d1209c9ec869 (diff) | |
| parent | f25529b08e356f89ca7cecc44295085531a8faba (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/system/linux-container.scm')
| -rw-r--r-- | gnu/system/linux-container.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 409386a84f..7c45dbccaf 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -150,15 +150,18 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." (essential-services (container-essential-services this-operating-system #:shared-network? shared-network?)) - (services (append (remove (lambda (service) - (memq (service-kind service) - services-to-drop)) - (modify-services (operating-system-user-services os) - (nscd-service-type - config => (nscd-configuration - (inherit config) - (caches %nscd-container-caches))))) - services-to-add)) + (services + (append services-to-add + (filter-map (lambda (s) + (cond ((memq (service-kind s) services-to-drop) + #f) + ((eq? nscd-service-type (service-kind s)) + (service nscd-service-type + (nscd-configuration + (inherit (service-value s)) + (caches %nscd-container-caches)))) + (else s))) + (operating-system-user-services os)))) (file-systems (append (map mapping->fs (if shared-network? (append %network-file-mappings mappings) |