aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorDavid Thompson <davet@gnu.org>2015-06-08 09:04:38 -0400
committerDavid Thompson <dthompson2@worcester.edu>2015-10-30 13:22:59 -0400
commit1c8a81b1af81bdb2fd87efb38004900ad5a77d36 (patch)
treea0eb77e6687626a247bff906cab867b2bfb886af /gnu/system
parent8e5999e0b0a4f3e639663a803eb99486c3d8304a (diff)
downloadpatches-1c8a81b1af81bdb2fd87efb38004900ad5a77d36.tar
patches-1c8a81b1af81bdb2fd87efb38004900ad5a77d36.tar.gz
scripts: system: Add 'container' action.
* 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.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/linux-container.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index abe816f483..c2eb773931 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -108,7 +108,12 @@ that will be shared with the host system."
(setenv "TMPDIR" "/tmp")
(setenv "GUIX_NEW_SYSTEM" #$os-drv)
(for-each mkdir-p '("/run" "/bin" "/etc" "/home" "/var"))
- (primitive-load (string-append #$os-drv "/boot"))))))
+ (primitive-load (string-append #$os-drv "/boot")))
+ ;; A range of 65536 uid/gids is used to cover 16 bits worth of
+ ;; users and groups, which is sufficient for most cases.
+ ;;
+ ;; See: http://www.freedesktop.org/software/systemd/man/systemd-nspawn.html#--private-users=
+ #:host-uids 65536)))
(gexp->script "run-container" script
#:modules '((ice-9 match)