summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-02-25 02:55:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-27 07:36:32 +0000
commit7ce7756adfce50ba12be319b1f087f31064376b8 (patch)
tree7b3711747179173aec5a9f63359f47daeadb7657 /meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
parent3af8d90203e76dc900ea10e3e81d158203ee96c8 (diff)
downloadpoky-7ce7756adfce50ba12be319b1f087f31064376b8.tar.gz
systemd: Upgrade 218 -> 219
219 has been in the docks for sometime, the older patch got merged this patch is now upgrading 218 to 219 Make all patches using git Change-Id: Ib0350144592aba26cad56c13c9a5522515915c58 (From OE-Core rev: 041570e584b98b580cc75f9ee23372da74a84377) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
deleted file mode 100644
index 7170a38af3..0000000000
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Denied [no desire for uclibc support]
2Signed-off-by: Khem Raj <raj.khem@gmail.com>
3
4Index: systemd-209/src/nspawn/nspawn.c
5===================================================================
6--- systemd-209.orig/src/nspawn/nspawn.c 2014-02-19 15:03:09.000000000 -0800
7+++ systemd-209/src/nspawn/nspawn.c 2014-02-19 23:20:38.720628627 -0800
8@@ -91,6 +91,8 @@
9 LINK_GUEST
10 } LinkJournal;
11
12+#include "config.h"
13+
14 static char *arg_directory = NULL;
15 static char *arg_user = NULL;
16 static sd_id128_t arg_uuid = {};
17@@ -2045,7 +2047,12 @@
18 a[0] = (char*) "/sbin/init";
19 execve(a[0], a, env_use);
20 } else if (argc > optind)
21+#ifdef HAVE_EXECVPE
22 execvpe(argv[optind], argv + optind, env_use);
23+#else
24+ environ = env_use;
25+ execvp(argv[optind], argv + optind);
26+#endif /* HAVE_EXECVPE */
27 else {
28 chdir(home ? home : "/root");
29 execle("/bin/bash", "-bash", NULL, env_use);