1
0
Fork 0

xwayland: Shut up conditionally

This commit is contained in:
Jasper St. Pierre 2014-03-25 12:41:52 -04:00
parent ef65848d11
commit d699b2409a

View file

@ -372,14 +372,22 @@ meta_xwayland_start (MetaXWaylandManager *manager,
"-nolisten", "-nolisten",
"all", "all",
NULL }; NULL };
int flags = 0;
flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
flags |= G_SPAWN_DO_NOT_REAP_CHILD;
/* xwayland, please. */
if (getenv ("XWAYLAND_STFU"))
{
flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
flags |= G_SPAWN_STDERR_TO_DEV_NULL;
}
if (g_spawn_async (NULL, /* cwd */ if (g_spawn_async (NULL, /* cwd */
args, args,
env, env,
G_SPAWN_LEAVE_DESCRIPTORS_OPEN | flags,
G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL,
uncloexec, uncloexec,
GINT_TO_POINTER (sp[1]), GINT_TO_POINTER (sp[1]),
&pid, &pid,