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

pack: Factorize store references in wrapper.

Browse source 
* 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@".
This commit is contained in:
Ludovic Courtès 2020-05-13 14:38:12 +02:00
parent fde2aec3f4
commit 0cd13e72f2
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/aux-files/run-in-namespace.c
View file

@ -42,6 +42,10 @@
#include <dirent.h> #include <dirent.h>
#include <sys/syscall.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. */ /* Like 'malloc', but abort if 'malloc' returns NULL. */
static void * static void *
xmalloc (size_t size) 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. */ bind-mounted in the right place. */
int err; int err;
char *new_root = mkdtemp (strdup ("/tmp/guix-exec-XXXXXX")); 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 (); char *cwd = get_current_dir_name ();
/* Create a child with separate namespaces and set up bind-mounts from /* 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_specific_argc = 4;
int proot_argc = argc + proot_specific_argc; int proot_argc = argc + proot_specific_argc;
char *proot_argv[proot_argc + 1], *proot; 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); strcpy (bind_spec, store);
strcat (bind_spec, ":"); strcat (bind_spec, ":");
strcat (bind_spec, "@STORE_DIRECTORY@"); strcat (bind_spec, original_store);
proot = concat (store, PROOT_PROGRAM); 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 /* SELF is something like "/home/ludo/.local/gnu/store/…-foo/bin/ls" and we
want to extract "/home/ludo/.local/gnu/store". */ want to extract "/home/ludo/.local/gnu/store". */
size_t index = strlen (self) size_t index = strlen (self)
- strlen ("@WRAPPED_PROGRAM@") - strlen ("@WRAPPED_PROGRAM@") + strlen (original_store);
+ strlen ("@STORE_DIRECTORY@");
char *store = strdup (self); char *store = strdup (self);
store[index] = '\0'; store[index] = '\0';
@ -424,7 +427,7 @@ main (int argc, char *argv[])
@WRAPPED_PROGRAM@ right away. This is not just an optimization: it's @WRAPPED_PROGRAM@ right away. This is not just an optimization: it's
needed when running one of these wrappers from within an unshare'd needed when running one of these wrappers from within an unshare'd
namespace, because 'unshare' fails with EPERM in that context. */ 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) && lstat ("@WRAPPED_PROGRAM@", &statbuf) != 0)
{ {
const struct engine *engine = execution_engine (); const struct engine *engine = execution_engine ();