diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-05-18 00:42:05 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-18 00:43:28 +0200 |
commit | 01dbc7e01a576bf388914dfe99fa473e87728462 (patch) | |
tree | e461081eb1082733b5d48dd01f7f802b0435061f | |
parent | 175ced413cb1c31ec58e06a4c2de8a0ae53fdaeb (diff) | |
download | patches-01dbc7e01a576bf388914dfe99fa473e87728462.tar patches-01dbc7e01a576bf388914dfe99fa473e87728462.tar.gz |
install: Files in the tarball are all root-owned.
Fixes a thinko introduced in 175ced4.
* gnu/system/install.scm (self-contained-tarball): Use "root:0" as the
owner and group.
* doc/guix.texi (Binary Installation): Revert 175ced4.
-rw-r--r-- | doc/guix.texi | 6 | ||||
-rw-r--r-- | gnu/system/install.scm | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index bb0d39cb8f..604ffcf0fb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -265,12 +265,6 @@ is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on. @item -Create the group and user accounts for build users as explained below -(@pxref{Build Environment Setup}). Use the exact same names as given in -the example so that files extracted from the archive will have the right -ownership. - -@item As @code{root}, run: @example diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 2ae7f27690..799851c9d7 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -67,14 +67,10 @@ under /root/.guix-profile where GUIX is installed." #:closure "profile") ;; Create the tarball. Use GNU format so there's no file name - ;; length limitation. Use the owner and group names given in the - ;; manual. - ;; XXX: /var and /root should rather be root-owned, but it doesn't - ;; make any difference in practice. + ;; length limitation. (with-directory-excursion %root (zero? (system* "tar" "--xz" "--format=gnu" - "--owner=guixbuilder01" - "--group=guixbuild" + "--owner=root:0" "--group=root:0" "-cvf" #$output "."))))) (gexp->derivation "guix-tarball.tar.xz" build |