From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH 13/15] scripts: system: Add 'container' action. Date: Mon, 6 Jul 2015 09:16:42 -0400 Message-ID: <1436188604-2813-13-git-send-email-dthompson2@worcester.edu> References: <1436188604-2813-1-git-send-email-dthompson2@worcester.edu> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC6HB-0001YZ-Mj for guix-devel@gnu.org; Mon, 06 Jul 2015 09:17:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZC6H8-00070e-Mf for guix-devel@gnu.org; Mon, 06 Jul 2015 09:17:37 -0400 Received: from mail-qk0-f172.google.com ([209.85.220.172]:33871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC6H8-00070W-IV for guix-devel@gnu.org; Mon, 06 Jul 2015 09:17:34 -0400 Received: by qkeo142 with SMTP id o142so116532294qke.1 for ; Mon, 06 Jul 2015 06:17:34 -0700 (PDT) In-Reply-To: <1436188604-2813-1-git-send-email-dthompson2@worcester.edu> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: David Thompson From: David Thompson * guix/scripts/system.scm (show-help): Display 'container' action. (system-derivation-for-action, guix-system): Add 'container' case. (perform-action): Skip GRUB config generation when building a container. * doc/guix.texi (Invoking guix system): Document it. --- doc/guix.texi | 21 +++++++++++++++++++++ guix/scripts/system.scm | 19 +++++++++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 284d667..d24f97e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6298,6 +6298,27 @@ using the following command: # dd if=$(guix system disk-image my-os.scm) of=/dev/sdc @end example +@item container +Return a script to run the operating system declared in @var{file} +within a container. Currently, the script must be run as root in order +to support more than a single user and group. + +The container shares its store with the host system. + +Additional file systems can be shared between the host and the container +using the @code{--share} and @code{--expose} command-line options: the +former specifies a directory to be shared with write access, while the +latter provides read-only access to the shared directory. + +The example below creates a container in which the user's home directory +is accessible read-only, and where the @file{/exchange} directory is a +read-write mapping of the host's @file{$HOME/tmp}: + +@example +guix system container my-config.scm \ + --expose=$HOME --share=$HOME/tmp=/exchange +@end example + @end table @var{options} can contain any of the common build options provided by diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 6084ab8..ab8ffd7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -31,6 +31,7 @@ #:use-module (gnu build install) #:use-module (gnu system) #:use-module (gnu system file-systems) + #:use-module (gnu system linux-container) #:use-module (gnu system vm) #:use-module (gnu system grub) #:use-module (gnu packages grub) @@ -285,6 +286,8 @@ it atomically, and then run OS's activation script." (case action ((build init reconfigure) (operating-system-derivation os)) + ((container) + (container-script os #:mappings mappings)) ((vm-image) (system-qemu-image os #:disk-image-size image-size)) ((vm) @@ -324,10 +327,12 @@ boot directly to the kernel or to the bootloader." #:full-boot? full-boot? #:mappings mappings)) (grub (package->derivation grub)) - (grub.cfg (operating-system-grub.cfg os - (if (eq? 'init action) - '() - (previous-grub-entries)))) + (grub.cfg (if (eq? 'container action) + (return #f) + (operating-system-grub.cfg os + (if (eq? 'init action) + '() + (previous-grub-entries))))) (drvs -> (if (and grub? (memq action '(init reconfigure))) (list sys grub grub.cfg) (list sys))) @@ -382,6 +387,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")) @@ -491,7 +498,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)))))) @@ -512,7 +519,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) -- 2.4.3