On Thu, Oct 29, 2015 at 6:00 PM, Ludovic Courtès <[email protected]> wrote: > "Thompson, David" <[email protected]> skribis: > >> On Tue, Oct 27, 2015 at 9:22 AM, Ludovic Courtès <[email protected]> wrote: >>> Sorry, I meant to preserve #:container? behavior but I forgot this bit. >>> >>> I believe the attached patch provides an Even Greater Way to address the >>> problem, namely by making the modprobe/firmware thing an optional >>> service. >>> >>> Could you try and report back? I tried it in a VM and there’s no >>> regression. >> >> It works great, thanks! > > Applied!
Thanks! Here's the new patch. - Dave
From 750131550354a25541a3adcdd983f4053bb86cc9 Mon Sep 17 00:00:00 2001 From: David Thompson <[email protected]> Date: Thu, 29 Oct 2015 00:15:36 -0400 Subject: [PATCH] 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. --- gnu/system/linux-container.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index fdf7460..abe816f 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 -- 2.5.0
