[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/13: gnu: system: Do not activate firmware when activating a container
From: |
David Thompson |
Subject: |
10/13: gnu: system: Do not activate firmware when activating a container. |
Date: |
Fri, 26 Jun 2015 00:27:36 +0000 |
davexunit pushed a commit to branch wip-container
in repository guix.
commit 6303f593911b4c26df75bba7bca9289c34483f07
Author: David Thompson <address@hidden>
Date: Mon Jun 8 08:59:51 2015 -0400
gnu: system: Do not activate firmware when activating a container.
* gnu/system.scm (operating-system-activation-script): Add #:container?
keyword argument. Don't call 'activate-firmware' when 'container?' is #t.
---
gnu/system.scm | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 82b7fbc..431b55f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -679,7 +679,7 @@ variable is not set---hence the need for this wrapper."
(apply execl #$modprobe
(cons #$modprobe (cdr (command-line))))))))
-(define (operating-system-activation-script os)
+(define* (operating-system-activation-script os #:key container?)
"Return the activation script for OS---i.e., the code that \"activates\" the
stateful part of OS, including user accounts and groups, special directories,
etc."
@@ -752,9 +752,12 @@ etc."
;; Tell the kernel to use our 'modprobe' command.
(activate-modprobe #$modprobe)
- ;; Tell the kernel where firmware is.
- (activate-firmware
- (string-append #$firmware "/lib/firmware"))
+ ;; Tell the kernel where firmware is, unless we are
+ ;; activating a container.
+ #$@(if container?
+ #~()
+ #~(activate-firmware
+ (string-append #$firmware "/lib/firmware")))
;; Let users debug their own processes!
(activate-ptrace-attach)
- branch wip-container created (now bfd304b), David Thompson, 2015/06/25
- 01/13: build: syscalls: Add clone syscall wrapper., David Thompson, 2015/06/25
- 04/13: build: syscalls: Add unmount flags., David Thompson, 2015/06/25
- 02/13: build: syscalls: Add setns syscall wrapper., David Thompson, 2015/06/25
- 03/13: build: syscalls: Add additional mount flags., David Thompson, 2015/06/25
- 05/13: build: syscalls: Add mkdtemp!, David Thompson, 2015/06/25
- 06/13: build: syscalls: Add pivot-root., David Thompson, 2015/06/25
- 07/13: utils: Add call-with-temporary-directory., David Thompson, 2015/06/25
- 09/13: gnu: Add Linux container system script., David Thompson, 2015/06/25
- 10/13: gnu: system: Do not activate firmware when activating a container.,
David Thompson <=
- 08/13: gnu: Add Linux container module., David Thompson, 2015/06/25
- 11/13: gnu: system: Add operating-system-derivation/container., David Thompson, 2015/06/25
- 12/13: scripts: system: Add 'container' subcommand., David Thompson, 2015/06/25
- 13/13: scripts: environment: Add --container option., David Thompson, 2015/06/25