um: xterm: Add Wayland support

Under Wayland, we should check WAYLAND_DISPLAY instead.

Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250326070113.401857-2-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index e4316c7981e80229d5363c3aa29bac52c071db2c..f607af738eac93083e6873b2efd2a451dc4a4ad6 100644 (file)
--- 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;
        }