diff options
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.patch | 16 |
1 files changed, 8 insertions, 8 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 index 6e6f199ef1..586b5aab7d 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From ae999ff50efb9cc82537adef7696c6f732afcfc8 Mon Sep 17 00:00:00 2001 | 1 | From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 05:10:37 +0000 | 3 | Date: Wed, 9 Nov 2016 19:33:49 -0800 |
4 | Subject: [PATCH 08/36] nspawn: Use execvpe only when libc supports it | 4 | Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it |
5 | 5 | ||
6 | Upstream-Status: Denied [no desire for uclibc support] | 6 | Upstream-Status: Denied [no desire for uclibc support] |
7 | 7 | ||
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 1 file changed, 7 insertions(+) | 11 | 1 file changed, 7 insertions(+) |
12 | 12 | ||
13 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 13 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
14 | index 5a68fec..65e65ec 100644 | 14 | index 9b9ae90..19b47cd 100644 |
15 | --- a/src/nspawn/nspawn.c | 15 | --- a/src/nspawn/nspawn.c |
16 | +++ b/src/nspawn/nspawn.c | 16 | +++ b/src/nspawn/nspawn.c |
17 | @@ -111,6 +111,8 @@ typedef enum LinkJournal { | 17 | @@ -123,6 +123,8 @@ typedef enum LinkJournal { |
18 | LINK_GUEST | 18 | LINK_GUEST |
19 | } LinkJournal; | 19 | } LinkJournal; |
20 | 20 | ||
@@ -23,7 +23,7 @@ index 5a68fec..65e65ec 100644 | |||
23 | static char *arg_directory = NULL; | 23 | static char *arg_directory = NULL; |
24 | static char *arg_template = NULL; | 24 | static char *arg_template = NULL; |
25 | static char *arg_chdir = NULL; | 25 | static char *arg_chdir = NULL; |
26 | @@ -2637,7 +2639,12 @@ static int inner_child( | 26 | @@ -2871,7 +2873,12 @@ static int inner_child( |
27 | a[0] = (char*) "/sbin/init"; | 27 | a[0] = (char*) "/sbin/init"; |
28 | execve(a[0], a, env_use); | 28 | execve(a[0], a, env_use); |
29 | } else if (!strv_isempty(arg_parameters)) | 29 | } else if (!strv_isempty(arg_parameters)) |
@@ -35,7 +35,7 @@ index 5a68fec..65e65ec 100644 | |||
35 | +#endif /* HAVE_EXECVPE */ | 35 | +#endif /* HAVE_EXECVPE */ |
36 | else { | 36 | else { |
37 | if (!arg_chdir) | 37 | if (!arg_chdir) |
38 | chdir(home ?: "/root"); | 38 | /* If we cannot change the directory, we'll end up in /, that is expected. */ |
39 | -- | 39 | -- |
40 | 1.8.3.1 | 40 | 2.10.2 |
41 | 41 | ||