summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
deleted file mode 100644
index 586b5aab7d..0000000000
--- a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Nov 2016 19:33:49 -0800
4Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it
5
6Upstream-Status: Denied [no desire for uclibc support]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/nspawn/nspawn.c | 7 +++++++
11 1 file changed, 7 insertions(+)
12
13diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
14index 9b9ae90..19b47cd 100644
15--- a/src/nspawn/nspawn.c
16+++ b/src/nspawn/nspawn.c
17@@ -123,6 +123,8 @@ typedef enum LinkJournal {
18 LINK_GUEST
19 } LinkJournal;
20
21+#include "config.h"
22+
23 static char *arg_directory = NULL;
24 static char *arg_template = NULL;
25 static char *arg_chdir = NULL;
26@@ -2871,7 +2873,12 @@ static int inner_child(
27 a[0] = (char*) "/sbin/init";
28 execve(a[0], a, env_use);
29 } else if (!strv_isempty(arg_parameters))
30+#ifdef HAVE_EXECVPE
31 execvpe(arg_parameters[0], arg_parameters, env_use);
32+#else
33+ environ = env_use;
34+ execvp(arg_parameters[0], arg_parameters);
35+#endif /* HAVE_EXECVPE */
36 else {
37 if (!arg_chdir)
38 /* If we cannot change the directory, we'll end up in /, that is expected. */
39--
402.10.2
41