summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-01-19 14:39:51 -0500
committerRay Strode <rstrode@redhat.com>2015-02-17 23:48:10 -0500
commit948a03e28f94f2c368267a591d7fea7084d61c81 (patch)
treeac77f713d95843b3206c8b13541031c4bc950aaa
parent7d0a563515350a33a420cbac2bf9d24db963faf0 (diff)
downloadgdm-wip/wayland-at-login-screen.tar.gz
daemon: add wrapper for launching X sessionwip/wayland-at-login-screen
This commit adds a utility for launching an X server and session together. This utility works a lot like xinit, but makes use of modern X features (like -displayfd) and has GDM specific integration (like reading from gdm configuration, and optionally running through /etc/gdm/Xsession) The eventual idea is to get the main GDM code out of the X server launching business and instead farm the logic off to an unprivileged helper that gets run within the logind session of the user.
-rw-r--r--daemon/gdm-x-session.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
index ce60a584..e97cfff5 100644
--- a/daemon/gdm-x-session.c
+++ b/daemon/gdm-x-session.c
@@ -224,6 +224,7 @@ spawn_x_server (State *state,
arguments = g_ptr_array_new ();
launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDIN_INHERIT);
+ g_subprocess_launcher_setenv (launcher, "DBUS_SESSION_BUS_ADDRESS", state->bus_address, TRUE);
g_subprocess_launcher_take_fd (launcher, pipe_fds[1], DISPLAY_FILENO);
if (g_getenv ("XDG_VTNR") != NULL) {