[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: pack: Factorize store references in wrapper.
From: |
guix-commits |
Subject: |
05/08: pack: Factorize store references in wrapper. |
Date: |
Thu, 14 May 2020 11:22:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 0cd13e72f2a1f85ad6facc485248685276981d63
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed May 13 14:38:12 2020 +0200
pack: Factorize store references in wrapper.
* gnu/packages/aux-files/run-in-namespace.c (original_store): New variable.
(exec_in_user_namespace, exec_with_proot, main): Use it instead of the
literal "@STORE_DIRECTORY@".
---
gnu/packages/aux-files/run-in-namespace.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/aux-files/run-in-namespace.c
b/gnu/packages/aux-files/run-in-namespace.c
index 6beac7f..6e97359 100644
--- a/gnu/packages/aux-files/run-in-namespace.c
+++ b/gnu/packages/aux-files/run-in-namespace.c
@@ -42,6 +42,10 @@
#include <dirent.h>
#include <sys/syscall.h>
+/* The original store, "/gnu/store" by default. */
+static const char original_store[] = "@STORE_DIRECTORY@";
+
+
/* Like 'malloc', but abort if 'malloc' returns NULL. */
static void *
xmalloc (size_t size)
@@ -228,7 +232,7 @@ exec_in_user_namespace (const char *store, int argc, char
*argv[])
bind-mounted in the right place. */
int err;
char *new_root = mkdtemp (strdup ("/tmp/guix-exec-XXXXXX"));
- char *new_store = concat (new_root, "@STORE_DIRECTORY@");
+ char *new_store = concat (new_root, original_store);
char *cwd = get_current_dir_name ();
/* Create a child with separate namespaces and set up bind-mounts from
@@ -307,11 +311,11 @@ exec_with_proot (const char *store, int argc, char
*argv[])
int proot_specific_argc = 4;
int proot_argc = argc + proot_specific_argc;
char *proot_argv[proot_argc + 1], *proot;
- char bind_spec[strlen (store) + 1 + sizeof "@STORE_DIRECTORY@"];
+ char bind_spec[strlen (store) + 1 + sizeof original_store];
strcpy (bind_spec, store);
strcat (bind_spec, ":");
- strcat (bind_spec, "@STORE_DIRECTORY@");
+ strcat (bind_spec, original_store);
proot = concat (store, PROOT_PROGRAM);
@@ -413,8 +417,7 @@ main (int argc, char *argv[])
/* SELF is something like "/home/ludo/.local/gnu/store/…-foo/bin/ls" and we
want to extract "/home/ludo/.local/gnu/store". */
size_t index = strlen (self)
- - strlen ("@WRAPPED_PROGRAM@")
- + strlen ("@STORE_DIRECTORY@");
+ - strlen ("@WRAPPED_PROGRAM@") + strlen (original_store);
char *store = strdup (self);
store[index] = '\0';
@@ -424,7 +427,7 @@ main (int argc, char *argv[])
@WRAPPED_PROGRAM@ right away. This is not just an optimization: it's
needed when running one of these wrappers from within an unshare'd
namespace, because 'unshare' fails with EPERM in that context. */
- if (strcmp (store, "@STORE_DIRECTORY@") != 0
+ if (strcmp (store, original_store) != 0
&& lstat ("@WRAPPED_PROGRAM@", &statbuf) != 0)
{
const struct engine *engine = execution_engine ();
- branch master updated (19e8a75 -> febd1fc), guix-commits, 2020/05/14
- 03/08: store: 'mapm/accumulate-builds' preserves '%current-target-system'., guix-commits, 2020/05/14
- 04/08: pack: Wrapper honors 'GUIX_EXECUTION_ENGINE' environment variable., guix-commits, 2020/05/14
- 05/08: pack: Factorize store references in wrapper.,
guix-commits <=
- 08/08: news: Add news entry for 'guix pack -RR' and Fakechroot., guix-commits, 2020/05/14
- 06/08: gnu: Add fakechroot., guix-commits, 2020/05/14
- 07/08: pack: Add relocation via ld.so and fakechroot., guix-commits, 2020/05/14
- 01/08: pack: Do not cross-compile the image building tools., guix-commits, 2020/05/14
- 02/08: packages: Ensure bags are insensitive to '%current-target-system'., guix-commits, 2020/05/14