[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: scripts: system: Add 'container' subcommand.
From: |
David Thompson |
Subject: |
10/11: scripts: system: Add 'container' subcommand. |
Date: |
Thu, 25 Jun 2015 01:48:15 +0000 |
davexunit pushed a commit to branch wip-container
in repository guix.
commit d4ce6d012ca0acee957294026735c88372d95d05
Author: David Thompson <address@hidden>
Date: Mon Jun 8 09:04:38 2015 -0400
scripts: system: Add 'container' subcommand.
* guix/scripts/system.scm (show-help): Display 'container' subcommand.
(system-derivation-for-action, guix-system): Add 'container' case.
---
guix/scripts/system.scm | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index aa9b3f8..9118ec2 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -30,6 +30,7 @@
#:use-module (guix build utils)
#:use-module (gnu build install)
#:use-module (gnu system)
+ #:use-module (gnu system linux-container)
#:use-module (gnu system vm)
#:use-module (gnu system grub)
#:use-module (gnu packages grub)
@@ -284,6 +285,8 @@ it atomically, and then run OS's activation script."
(case action
((build init reconfigure)
(operating-system-derivation os))
+ ((container)
+ (linux-container-script os))
((vm-image)
(system-qemu-image os #:disk-image-size image-size))
((vm)
@@ -381,6 +384,8 @@ Build the operating system declared in FILE according to
ACTION.\n"))
(display (_ "\
build build the operating system without installing anything\n"))
(display (_ "\
+ container build a Linux container that shares the host's store\n"))
+ (display (_ "\
vm build a virtual machine image that shares the host's
store\n"))
(display (_ "\
vm-image build a freestanding virtual machine image\n"))
@@ -490,7 +495,7 @@ Build the operating system declared in FILE according to
ACTION.\n"))
(alist-cons 'argument arg result)
(let ((action (string->symbol arg)))
(case action
- ((build vm vm-image disk-image reconfigure init)
+ ((build container vm vm-image disk-image reconfigure init)
(alist-cons 'action action result))
(else (leave (_ "~a: unknown action~%") action))))))
@@ -511,7 +516,7 @@ Build the operating system declared in FILE according to
ACTION.\n"))
action))
(case action
- ((build vm vm-image disk-image reconfigure)
+ ((build container vm vm-image disk-image reconfigure)
(unless (= count 1)
(fail)))
((init)
- branch wip-container created (now cee7d21), David Thompson, 2015/06/24
- 04/11: build: syscalls: Add mkdtemp!, David Thompson, 2015/06/24
- 03/11: build: syscalls: Add additional mount flags., David Thompson, 2015/06/24
- 01/11: build: syscalls: Add clone syscall wrapper., David Thompson, 2015/06/24
- 05/11: utils: Add call-with-temporary-directory., David Thompson, 2015/06/24
- 02/11: build: syscalls: Add setns syscall wrapper., David Thompson, 2015/06/24
- 08/11: gnu: system: Do not activate firmware when activating a container., David Thompson, 2015/06/24
- 06/11: gnu: Add Linux container module., David Thompson, 2015/06/24
- 07/11: gnu: Add Linux container system script., David Thompson, 2015/06/24
- 09/11: gnu: system: Add operating-system-derivation/container., David Thompson, 2015/06/24
- 10/11: scripts: system: Add 'container' subcommand.,
David Thompson <=
- 11/11: scripts: environment: Add --container option., David Thompson, 2015/06/24