aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-22 16:22:33 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-26 22:49:49 +0200
commit0e5c2d5e145118ec47329d6b3a534344d2e89cd3 (patch)
treebf84c01cbdd90a0ae3e044cb832f12d06ee67b15 /gnu/system
parent45c84c8f6f979c84d08b205ed3fb3d6769c4ae3f (diff)
downloadguix-0e5c2d5e145118ec47329d6b3a534344d2e89cd3.tar.gz
guix-0e5c2d5e145118ec47329d6b3a534344d2e89cd3.zip
services: system: Initial entries are non-monadic.
* gnu/system.scm (operating-system-directory-base-entries): Return a regular, non-monadic value. * gnu/services.scm (system-derivation): Adjust accordingly. * gnu/system/linux-container.scm (container-essential-services): Likewise.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/linux-container.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index c8807398b3..c5e2e4bf9c 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;;
@@ -53,9 +53,7 @@ from OS that are needed on the bare metal and not in a container."
(operating-system-default-essential-services os)))
(cons (service system-service-type
- (let ((locale (operating-system-locale-directory os)))
- (with-monad %store-monad
- (return `(("locale" ,locale))))))
+ `(("locale" ,(operating-system-locale-directory os))))
;; If network is to be shared with the host, remove network
;; configuration files from etc-service.
(if shared-network?