commit 92de1443312e69b217bf817c52cc0fb4bfae8ada
author Maksim Melnikau <maxposedon@gmail.com> Wed Aug 14 22:33:10 2013 +0300
committer Kristian Høgsberg <krh@bitplanet.net> Fri Aug 16 10:55:59 2013 -0700
tree c7a98421eeb1dc3d22535ced1fa0d87239746995
parent 06b16c2a0b07b7b17a3b9a30202f15c4992acf09

add [xwayland] path weston.ini option

It sets the path to the xserver to run.

Signed-off-by: Maksim Melnikau <maxposedon@gmail.com>

src/xwayland/launcher.c

diff --git a/src/xwayland/launcher.c b/src/xwayland/launcher.c
index b639479..8d8e060 100644
--- a/src/xwayland/launcher.c
+++ b/src/xwayland/launcher.c
@@ -42,6 +42,8 @@
 	struct weston_xserver *wxs = data;
 	char display[8], s[8];
 	int sv[2], client_fd;
+	char *xserver = NULL;
+	struct weston_config_section *section;
 
 	if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
 		weston_log("socketpair failed\n");
@@ -62,8 +64,11 @@
 
 		snprintf(display, sizeof display, ":%d", wxs->display);
 
-		if (execl(XSERVER_PATH,
-			  XSERVER_PATH,
+		section = weston_config_get_section(wxs->compositor->config, "xwayland", NULL, NULL);
+		weston_config_section_get_string(section, "path", &xserver, XSERVER_PATH);
+
+		if (execl(xserver,
+			  xserver,
 			  display,
 			  "-wayland",
 			  "-rootless",
@@ -72,6 +77,7 @@
 			  "-terminate",
 			  NULL) < 0)
 			weston_log("exec failed: %m\n");
+		free(xserver);
 		_exit(EXIT_FAILURE);
 
 	default: