OSDN Git Service

qga: allow to lookup in PATH from the passed envp for guest-exec
authorYuri Pudgorodskiy <yur@virtuozzo.com>
Thu, 12 Nov 2015 13:36:21 +0000 (16:36 +0300)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 17 Nov 2015 22:24:18 +0000 (16:24 -0600)
This was original behaviour before GLIB gspawn() rework and we rely on
this behaviour.

Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
* add version check (2.33.2) for G_SPAWN_SEARCH_PATH_FROM_ENVP
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
qga/commands.c

index 7644ca0..bb73e7d 100644 (file)
@@ -401,6 +401,9 @@ GuestExec *qmp_guest_exec(const char *path,
     envp = has_env ? guest_exec_get_args(env, false) : NULL;
 
     flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
+#if GLIB_CHECK_VERSION(2, 33, 2)
+    flags |= G_SPAWN_SEARCH_PATH_FROM_ENVP;
+#endif
     if (!has_output) {
         flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL;
     }