diff options
| author | Lars Bilke <lars.bilke@ufz.de> | 2024-06-14 15:23:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-07-10 16:00:36 +0200 |
| commit | 7893b32ef6ec85d51f082681a9f4fa911867afba (patch) | |
| tree | 5f513d27c9c5c0f4e33a0ecf3e2805768eefebe2 | |
| parent | 45cfc7a8f359e167ccf020d8a089d8a9b7606042 (diff) | |
| download | guix-7893b32ef6ec85d51f082681a9f4fa911867afba.tar.gz guix-7893b32ef6ec85d51f082681a9f4fa911867afba.zip | |
pack: Create /tmp in Apptainer images.
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>
| -rw-r--r-- | guix/scripts/pack.scm | 3 | ||||
| -rw-r--r-- | tests/pack.scm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index fe4df042d7..7c5fe76fe0 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -493,7 +493,8 @@ added to the pack." "-p" "/proc d 555 0 0" "-p" "/sys 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 ;; Initialize /var/guix. diff --git a/tests/pack.scm b/tests/pack.scm index 40897a5589..f8a9e09c28 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -328,6 +328,7 @@ (when (and (file-exists? (string-append bin "/guile")) (file-exists? "var/guix/db/db.sqlite") + (file-is-directory? "tmp") (string=? (string-append #$%bootstrap-guile "/bin") (pk 'binlink (readlink bin))) |