diff options
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.patch | 22 |
1 files changed, 11 insertions, 11 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 index 1d4f2732c4..7170a38af3 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch @@ -1,11 +1,11 @@ Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: git/src/nspawn/nspawn.c +Index: systemd-209/src/nspawn/nspawn.c =================================================================== ---- git.orig/src/nspawn/nspawn.c 2012-09-22 17:57:05.000000000 -0700 -+++ git/src/nspawn/nspawn.c 2012-09-22 18:01:41.541405768 -0700 -@@ -63,6 +63,8 @@ +--- systemd-209.orig/src/nspawn/nspawn.c 2014-02-19 15:03:09.000000000 -0800 ++++ systemd-209/src/nspawn/nspawn.c 2014-02-19 23:20:38.720628627 -0800 +@@ -91,6 +91,8 @@ LINK_GUEST } LinkJournal; @@ -13,17 +13,17 @@ Index: git/src/nspawn/nspawn.c + static char *arg_directory = NULL; static char *arg_user = NULL; - static char **arg_controllers = NULL; -@@ -1373,7 +1375,12 @@ + static sd_id128_t arg_uuid = {}; +@@ -2045,7 +2047,12 @@ a[0] = (char*) "/sbin/init"; - execve(a[0], a, (char**) envp); + execve(a[0], a, env_use); } else if (argc > optind) +#ifdef HAVE_EXECVPE - execvpe(argv[optind], argv + optind, (char**) envp); + execvpe(argv[optind], argv + optind, env_use); +#else -+ environ = (char **)envp; ++ environ = env_use; + execvp(argv[optind], argv + optind); -+#endif /* HAVE_EXECVPE */ ++#endif /* HAVE_EXECVPE */ else { chdir(home ? home : "/root"); - execle("/bin/bash", "-bash", NULL, (char**) envp); + execle("/bin/bash", "-bash", NULL, env_use); |