kvm tools: add HOME env var to hostfs

Add a HOME env var when booting a hostfs guest. This will point out to a home
dir within the given guest name.

This will make several apps happier when being run under hostfs.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-setup.c b/tools/kvm/builtin-setup.c
index 11aa676a3b522d4dac51419ad2e0233b2b6ecdf9..1b865b7fba634ca9557ebf6b6af934e90a7946f0 100644 (file)
--- a/tools/kvm/builtin-setup.c
+++ b/tools/kvm/builtin-setup.c
@@ -116,6 +116,7 @@ static const char *guestfs_dirs[] = {
        "/var",
        "/var/lib",
        "/virt",
+       "/virt/home",
 };
 
 static const char *guestfs_symlinks[] = {

diff --git a/tools/kvm/guest/init.c b/tools/kvm/guest/init.c
index e1f377f714a6ff9c2b806c370ffde606faf7dafe..ece48fd6461ce0e0259d8885a650f12a9b742b63 100644 (file)
--- a/tools/kvm/guest/init.c
+++ b/tools/kvm/guest/init.c
@@ -12,7 +12,8 @@
 static int run_process(char *filename)
 {
        char *new_argv[] = { filename, NULL };
-       char *new_env[] = { "TERM=linux", "DISPLAY=192.168.33.1:0", NULL };
+       char *new_env[] = { "TERM=linux", "DISPLAY=192.168.33.1:0",
+                               "HOME=/virt/home", NULL };
 
        return execve(filename, new_argv, new_env);
 }
@@ -20,7 +21,7 @@ static int run_process(char *filename)
 static int run_process_sandbox(char *filename)
 {
        char *new_argv[] = { filename, "/virt/sandbox.sh", NULL };
-       char *new_env[] = { "TERM=linux", NULL };
+       char *new_env[] = { "TERM=linux", "HOME=/virt/home", NULL };
 
        return execve(filename, new_argv, new_env);
 }