From: Tiwei Bie Date: Wed, 26 Mar 2025 07:01:12 +0000 (+0800) Subject: um: xterm: Add Wayland support X-Git-Tag: v6.16-rc1~38^2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9456e2c60171ecffc0ea26347418e6bedb64ee78;p=thirdparty%2Fkernel%2Fstable.git um: xterm: Add Wayland support Under Wayland, we should check WAYLAND_DISPLAY instead. Signed-off-by: Tiwei Bie Link: https://patch.msgid.link/20250326070113.401857-2-tiwei.btw@antgroup.com Signed-off-by: Johannes Berg --- diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c index e4316c7981e80..f607af738eac9 100644 --- a/arch/um/drivers/xterm.c +++ b/arch/um/drivers/xterm.c @@ -97,12 +97,9 @@ static int xterm_open(int input, int output, int primary, void *d, if (access(argv[4], X_OK) < 0) argv[4] = "port-helper"; - /* - * Check that DISPLAY is set, this doesn't guarantee the xterm - * will work but w/o it we can be pretty sure it won't. - */ - if (getenv("DISPLAY") == NULL) { - printk(UM_KERN_ERR "xterm_open: $DISPLAY not set.\n"); + /* Ensure we are running on Xorg or Wayland. */ + if (!getenv("DISPLAY") && !getenv("WAYLAND_DISPLAY")) { + printk(UM_KERN_ERR "xterm_open : neither $DISPLAY nor $WAYLAND_DISPLAY is set.\n"); return -ENODEV; }