diff options
author | Roger Pau Monne <roger.pau@citrix.com> | 2012-05-23 11:06:47 +0100 |
---|---|---|
committer | Roger Pau Monne <roger.pau@citrix.com> | 2012-05-23 11:06:47 +0100 |
commit | a185e8dfa236dc0abcde8d234f0ee7d793c4fb68 (patch) | |
tree | 35d801f822a8e490933c230c3f227ed191352bf5 /tools/libxl/libxl_bootloader.c | |
parent | b25df336bd3b81c8245811effe8b3b6389078f88 (diff) | |
download | xen-a185e8dfa236dc0abcde8d234f0ee7d793c4fb68.tar.gz xen-a185e8dfa236dc0abcde8d234f0ee7d793c4fb68.tar.bz2 xen-a185e8dfa236dc0abcde8d234f0ee7d793c4fb68.zip |
libxl: pass env vars to libxl__exec
Add another parameter to libxl__exec call that contains the
environment variables to use when performing the execvp call.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl/libxl_bootloader.c')
-rw-r--r-- | tools/libxl/libxl_bootloader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index ca8409cf98..f3a590be59 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -385,6 +385,7 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) libxl__bootloader_state *bl = CONTAINER_OF(op, *bl, openpty); STATE_AO_GC(bl->ao); int rc, r; + char *const env[] = { "TERM", "vt100", NULL }; if (bl->openpty.rc) { rc = bl->openpty.rc; @@ -478,8 +479,7 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) /* child */ r = login_tty(libxl__carefd_fd(bl->ptys[0].slave)); if (r) { LOGE(ERROR, "login_tty failed"); exit(-1); } - setenv("TERM", "vt100", 1); - libxl__exec(-1, -1, -1, bl->args[0], (char**)bl->args); + libxl__exec(gc, -1, -1, -1, bl->args[0], (char **) bl->args, env); exit(-1); } |