diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-23 15:08:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-23 16:38:12 +0200 |
| commit | 86b8869ffffad96e06e98d523f287b25684a6fa6 (patch) | |
| tree | 259bdfc90218042ab6e0728390f1c613f733f6c9 | |
| parent | 051b279fd08eec80cda248aa12e6875005b7dc4f (diff) | |
| download | guix-86b8869ffffad96e06e98d523f287b25684a6fa6.tar guix-86b8869ffffad96e06e98d523f287b25684a6fa6.tar.gz | |
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.
| -rw-r--r-- | gnu/services/shepherd.scm | 16 | ||||
| -rw-r--r-- | gnu/system/linux-container.scm | 3 |
2 files changed, 1 insertions, 18 deletions
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 21baacbaf7..45c67e04eb 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -60,7 +60,6 @@ %default-modules shepherd-service-file - %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -346,21 +345,6 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) -(define %containerized-shepherd-service - ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd - ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, - ;; but in a container that fails with EINVAL. This was fixed in Shepherd - ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. - (simple-service 'containerized-shepherd - shepherd-root-service-type - (list (shepherd-service - (provision '(containerized-shepherd)) - (start #~(lambda () - (set! (@@ (shepherd) - disable-reboot-on-ctrl-alt-del) - (const #t)) - #t)))))) - (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of <live-service>) that needs to be unloaded, and the subset of TARGET (a list of <shepherd-service>) that diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 37a053cdc3..149c3d08a3 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -29,7 +29,6 @@ #:use-module (gnu build linux-container) #:use-module (gnu services) #:use-module (gnu services base) - #:use-module (gnu services shepherd) #:use-module (gnu system) #:use-module (gnu system file-systems) #:export (system-container @@ -52,7 +51,7 @@ from OS that are needed on the bare metal and not in a container." (let ((locale (operating-system-locale-directory os))) (with-monad %store-monad (return `(("locale" ,locale)))))) - (append base (list %containerized-shepherd-service)))) + base)) (define (containerized-operating-system os mappings) "Return an operating system based on OS for use in a Linux container |