summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2015-10-29 00:15:36 -0400
committerDavid Thompson <dthompson2@worcester.edu>2015-10-30 12:51:49 -0400
commit8e5999e0b0a4f3e639663a803eb99486c3d8304a (patch)
treed2ff80172ced275e68fb8de865d90933fa134118 /gnu/system
parentbd0b4379b248dc7e08e152d3f597a2bbee81b4b3 (diff)
system: container: Adjust to changes in gexps.
* gnu/system/linux-container.scm (system-container): 'etc' is no longer a monadic value, and the result of 'file-union' must be lowered.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/linux-container.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index fdf7460872..abe816f483 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -25,6 +25,7 @@
#:use-module (guix derivations)
#:use-module (guix monads)
#:use-module (gnu build linux-container)
+ #:use-module (gnu services)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:export (mapping->file-system
@@ -50,14 +51,15 @@
"Return a derivation that builds OS as a Linux container."
(mlet* %store-monad
((profile (operating-system-profile os))
- (etc (operating-system-etc-directory os))
+ (etc -> (operating-system-etc-directory os))
(boot (operating-system-boot-script os #:container? #t))
(locale (operating-system-locale-directory os)))
- (file-union "system-container"
- `(("boot" ,#~#$boot)
- ("profile" ,#~#$profile)
- ("locale" ,#~#$locale)
- ("etc" ,#~#$etc)))))
+ (lower-object
+ (file-union "system-container"
+ `(("boot" ,#~#$boot)
+ ("profile" ,#~#$profile)
+ ("locale" ,#~#$locale)
+ ("etc" ,#~#$etc))))))
(define (containerized-operating-system os mappings)
"Return an operating system based on OS for use in a Linux container