From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 14 Mar 2011 02:28:16 +0000 (+0100)
Subject: nspawn: reset environment and load login shell
X-Git-Tag: v21~101
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=da5b3bad1cadb9d9062d01a17056ec085fb725f9

nspawn: reset environment and load login shell
---

diff --git a/src/nspawn.c b/src/nspawn.c
index 82b0ce4f1..297bb61f6 100644
--- a/src/nspawn.c
+++ b/src/nspawn.c
@@ -390,6 +390,11 @@ int main(int argc, char *argv[]) {
 
         if (pid == 0) {
                 const char *hn;
+                const char *envp[] = {
+                        "HOME=/root",
+                        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                        NULL
+                };
 
                 /* child */
 
@@ -425,9 +430,11 @@ int main(int argc, char *argv[]) {
                         sethostname(hn, strlen(hn));
 
                 if (argc > optind)
-                        execvp(argv[optind], argv + optind);
-                else
-                        execl("/bin/bash", "/bin/bash", NULL);
+                        execvpe(argv[optind], argv + optind, (char**) envp);
+                else {
+                        chdir("/root");
+                        execle("/bin/bash", "-bash", NULL, (char**) envp);
+                }
 
                 log_error("execv() failed: %m");