diff options
| author | Tudor Brindus <me@tbrindus.ca> | 2020-10-03 14:16:54 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-10-11 09:00:52 +0200 |
| commit | 1b0e4c7e6e0bf02b3c41962b669c00280ecc7712 (patch) | |
| tree | f8b7d866721700d5458483a1f2a1469943c83979 | |
| parent | feb0e1c74d13c44c4c0b8c8db360039846bc9617 (diff) | |
xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use
When debugging Xwayland-related issues, a common first step in debugging
has been to ask the reporter to move their real Xwayland to
/usr/bin/Xwayland.bin, and create a shell script starting Xwayland with
extra arguments under the original /usr/bin/Xwayland location.
Introducing a `WLR_XWAYLAND` environment variable makes this less
invasive, by allowing the user to swap out Xwayland without resorting to
global system changes (or source patches).
| -rw-r--r-- | docs/env_vars.md | 2 | ||||
| -rw-r--r-- | xwayland/server.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/env_vars.md b/docs/env_vars.md index 48f96f7f..9fca8165 100644 --- a/docs/env_vars.md +++ b/docs/env_vars.md @@ -9,6 +9,8 @@ wlroots reads these environment variables * *WLR_SESSION*: specifies the wlr\_session to be used (available sessions: logind/systemd, direct) * *WLR_DIRECT_TTY*: specifies the tty to be used (instead of using /dev/tty) +* *WLR_XWAYLAND*: specifies the path to an Xwayland binary to be used (instead + of following shell search semantics for "Xwayland") ## DRM backend diff --git a/xwayland/server.c b/xwayland/server.c index 27e9861a..24b435aa 100644 --- a/xwayland/server.c +++ b/xwayland/server.c @@ -107,8 +107,16 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) { dup2(devnull, STDERR_FILENO); } + const char *xwayland_path = getenv("WLR_XWAYLAND"); + if (xwayland_path) { + wlr_log(WLR_INFO, "Using Xwayland binary to '%s' due to WLR_XWAYLAND", + xwayland_path); + } else { + xwayland_path = "Xwayland"; + } + // This returns if and only if the call fails - execvp("Xwayland", argv); + execvp(xwayland_path, argv); wlr_log_errno(WLR_ERROR, "failed to exec Xwayland"); close(devnull); |