summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-08 23:25:51 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-08 23:25:51 +0200
commit7acd3439eab716882835228be16346c5d3b4df21 (patch)
tree563a8baa04c64a698ec8b7320a5d6cc0978bb075 /gnu
parent751630c9c3f7f3e87dfccc5f5ba8cf61cdd6f8fd (diff)
downloadguix-patches-7acd3439eab716882835228be16346c5d3b4df21.tar
guix-patches-7acd3439eab716882835228be16346c5d3b4df21.tar.gz
install: Omit /root from the binary tarball.
Suggested by Thomas Schwinge <thomas@codesourcery.com>. * gnu/system/install.scm (self-contained-tarball): Remove "/root/.guix-profile" from the 'tar' arguments. * doc/guix.texi (Binary Installation): Add a step to create ~root/.guix-profile.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/install.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index cacd089d6b..27d8ecdefc 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -73,11 +73,12 @@ under /root/.guix-profile where GUIX is installed."
(zero? (system* "tar" "--xz" "--format=gnu"
"--owner=root:0" "--group=root:0"
"-cvf" #$output
- ;; Avoid adding /, /var, or /root to the tarball,
+ ;; Avoid adding / and /var to the tarball,
;; so that the ownership and permissions of those
;; directories will not be overwritten when
- ;; extracting the archive.
- "./root/.guix-profile"
+ ;; extracting the archive. Do not include /root
+ ;; because the root account might have a different
+ ;; home directory.
"./var/guix"
(string-append "." (%store-directory)))))))