ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pack: Create /tmp in Apptainer images.

Browse source 
Related to <https://bugs.gnu.org/37161> and
<https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7979a287f8eb84cbbfa44629951572408939a756>.

* guix/scripts/pack.scm (squashfs-image)[build]: Add /tmp to the set of
directories created.
* tests/pack.scm ("squashfs-image + localstatedir"): Check for /tmp.

Change-Id: I576aaa6ba8cb8478acf4c3144d492ae5caf411ca
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Lars Bilke 2024-06-14 15:23:48 +02:00 committed by Ludovic Courtès
parent 45cfc7a8f3
commit 7893b32ef6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
guix/scripts/pack.scm
View file

@ -493,7 +493,8 @@ (define (mksquashfs args)
"-p" "/proc d 555 0 0" "-p" "/proc d 555 0 0"
"-p" "/sys d 555 0 0" "-p" "/sys d 555 0 0"
"-p" "/dev d 555 0 0" "-p" "/dev d 555 0 0"
"-p" "/home d 555 0 0")) "-p" "/home d 555 0 0"
"-p" "/tmp d 555 0 0"))
(when database (when database
;; Initialize /var/guix. ;; Initialize /var/guix.

1
tests/pack.scm
View file

@ -328,6 +328,7 @@ (define bin
(when (and (file-exists? (string-append bin (when (and (file-exists? (string-append bin
"/guile")) "/guile"))
(file-exists? "var/guix/db/db.sqlite") (file-exists? "var/guix/db/db.sqlite")
(file-is-directory? "tmp")
(string=? (string-append #$%bootstrap-guile "/bin") (string=? (string-append #$%bootstrap-guile "/bin")
(pk 'binlink (readlink bin))) (pk 'binlink (readlink bin)))