diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-03 16:55:05 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-09-08 11:36:53 +0200 |
commit | 008ad8750226733c3e771565d8c60089cb1108ab (patch) | |
tree | c4c11d94aff7772592a3f53a9f71ea1a051c0ff1 /meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch | |
parent | 8d87ca7f803d053e2cdc1f6322581e7852af01fa (diff) | |
download | meta-openembedded-contrib-008ad8750226733c3e771565d8c60089cb1108ab.tar.gz |
systemd: Upgrade to 189
Fix running and building on uclibc
Currently it doesnt work on uclibc-git
only on 0.9.33 but thats a regression in
uclibc most likely
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch')
-rw-r--r-- | meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch new file mode 100644 index 0000000000..ea8b3ffb19 --- /dev/null +++ b/meta-systemd/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch @@ -0,0 +1,29 @@ +--- systemd-pam-185/src/nspawn/nspawn.c.orig 2012-06-21 05:31:24.000000000 -0400 ++++ systemd-pam-185/src/nspawn/nspawn.c 2012-06-21 05:29:50.000000000 -0400 +@@ -61,6 +61,8 @@ + #include "path-util.h" + #include "loopback-setup.h" + ++#include "config.h" ++ + static char *arg_directory = NULL; + static char *arg_user = NULL; + static char **arg_controllers = NULL; +@@ -1315,9 +1317,14 @@ + + a[0] = (char*) "/sbin/init"; + execve(a[0], a, (char**) envp); +- } else if (argc > optind) +- execvpe(argv[optind], argv + optind, (char**) envp); +- else { ++ } else if (argc > optind) { ++#ifdef HAVE_EXECVPE ++ execvpe(argv[optind], argv + optind, (char**) envp); ++#else ++ environ = (char **)envp; ++ execvp(argv[optind], argv + optind); ++#endif /* HAVE_EXECVPE */ ++ } else { + chdir(home ? home : "/root"); + execle("/bin/bash", "-bash", NULL, (char**) envp); + } |