summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-23 15:08:31 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-23 16:38:12 +0200
commit86b8869ffffad96e06e98d523f287b25684a6fa6 (patch)
tree259bdfc90218042ab6e0728390f1c613f733f6c9 /gnu/system
parent051b279fd08eec80cda248aa12e6875005b7dc4f (diff)
linux-container: Remove '%containerized-shepherd-service' hack.
This hack worked around a defect in the Shepherd 0.5.0 and is no longer needed. * gnu/services/shepherd.scm (%containerized-shepherd-service): Remove. * gnu/system/linux-container.scm (container-essential-services): Don't use it.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/linux-container.scm3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 37a053cdc38..149c3d08a32 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -29,7 +29,6 @@
29 #:use-module (gnu build linux-container) 29 #:use-module (gnu build linux-container)
30 #:use-module (gnu services) 30 #:use-module (gnu services)
31 #:use-module (gnu services base) 31 #:use-module (gnu services base)
32 #:use-module (gnu services shepherd)
33 #:use-module (gnu system) 32 #:use-module (gnu system)
34 #:use-module (gnu system file-systems) 33 #:use-module (gnu system file-systems)
35 #:export (system-container 34 #:export (system-container
@@ -52,7 +51,7 @@ from OS that are needed on the bare metal and not in a container."
52 (let ((locale (operating-system-locale-directory os))) 51 (let ((locale (operating-system-locale-directory os)))
53 (with-monad %store-monad 52 (with-monad %store-monad
54 (return `(("locale" ,locale)))))) 53 (return `(("locale" ,locale))))))
55 (append base (list %containerized-shepherd-service)))) 54 base))
56 55
57(define (containerized-operating-system os mappings) 56(define (containerized-operating-system os mappings)
58 "Return an operating system based on OS for use in a Linux container 57 "Return an operating system based on OS for use in a Linux container