Commit 9456e2c6 authored by Tiwei Bie's avatar Tiwei Bie Committed by Johannes Berg
Browse files

um: xterm: Add Wayland support 



Under Wayland, we should check WAYLAND_DISPLAY instead.

Signed-off-by: default avatarTiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250326070113.401857-2-tiwei.btw@antgroup.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 92a09c47

arch/um/drivers/xterm.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

	}