nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
David Thompson 2015-10-29 00:15:36 -04:00
parent bd0b4379b2
commit 8e5999e0b0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/system/linux-container.scm
View File

@ -25,6 +25,7 @@
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (gnu build linux-container) #:use-module (gnu build linux-container)
#:use-module (gnu services)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:export (mapping->file-system #:export (mapping->file-system
@ -50,14 +51,15 @@
"Return a derivation that builds OS as a Linux container." "Return a derivation that builds OS as a Linux container."
(mlet* %store-monad (mlet* %store-monad
((profile (operating-system-profile os)) ((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)) (boot (operating-system-boot-script os #:container? #t))
(locale (operating-system-locale-directory os))) (locale (operating-system-locale-directory os)))
(file-union "system-container" (lower-object
`(("boot" ,#~#$boot) (file-union "system-container"
("profile" ,#~#$profile) `(("boot" ,#~#$boot)
("locale" ,#~#$locale) ("profile" ,#~#$profile)
("etc" ,#~#$etc))))) ("locale" ,#~#$locale)
("etc" ,#~#$etc))))))
(define (containerized-operating-system os mappings) (define (containerized-operating-system os mappings)
"Return an operating system based on OS for use in a Linux container "Return an operating system based on OS for use in a Linux container