install: Omit /, /root, and /var from binary tarball.
* gnu/system/install.scm (self-contained-tarball): Pass "./root/.guix-profile", "./var/guix", and "./gnu" to 'tar' command instead of ".".
This commit is contained in:
		
							parent
							
								
									1b6764477f
								
							
						
					
					
						commit
						b2a5fa594e
					
				
					 1 changed files with 9 additions and 1 deletions
				
			
		| 
						 | 
					@ -1,5 +1,6 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 | 
					;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
 | 
					;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -71,7 +72,14 @@ under /root/.guix-profile where GUIX is installed."
 | 
				
			||||||
          (with-directory-excursion %root
 | 
					          (with-directory-excursion %root
 | 
				
			||||||
            (zero? (system* "tar" "--xz" "--format=gnu"
 | 
					            (zero? (system* "tar" "--xz" "--format=gnu"
 | 
				
			||||||
                            "--owner=root:0" "--group=root:0"
 | 
					                            "--owner=root:0" "--group=root:0"
 | 
				
			||||||
                            "-cvf" #$output ".")))))
 | 
					                            "-cvf" #$output
 | 
				
			||||||
 | 
					                            ;; Avoid adding /, /var, or /root to the tarball,
 | 
				
			||||||
 | 
					                            ;; so that the ownership and permissions of those
 | 
				
			||||||
 | 
					                            ;; directories will not be overwritten when
 | 
				
			||||||
 | 
					                            ;; extracting the archive.
 | 
				
			||||||
 | 
					                            "./root/.guix-profile"
 | 
				
			||||||
 | 
					                            "./var/guix"
 | 
				
			||||||
 | 
					                            "./gnu")))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    (gexp->derivation "guix-tarball.tar.xz" build
 | 
					    (gexp->derivation "guix-tarball.tar.xz" build
 | 
				
			||||||
                      #:references-graphs `(("profile" ,profile))
 | 
					                      #:references-graphs `(("profile" ,profile))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue