[PATCH] weston: Don't exit just because tty is in gfx mode already

Florian Hänel florian.haenel at heeen.de
Mon May 16 22:25:52 UTC 2016

From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel at lge.com>

If weston crashed (or during development) it can leave the tty
in graphics mode, which would prevent it from ever coming up again.

Another compositor running should be handled by upstart/systemd
and the tty in graphics mode does not prevent us from using it.

A informational log message for debugging purposes should be enough.
  src/launcher-util.c | 1 -
  1 file changed, 1 deletion(-)

diff --git a/src/launcher-util.c b/src/launcher-util.c
index e89710b..a98ff74 100644
--- a/src/launcher-util.c
+++ b/src/launcher-util.c
@@ -319,7 +319,6 @@ setup_tty(struct weston_launcher *launcher, int tty)
      if (kd_mode != KD_TEXT) {
          weston_log("%s is already in graphics mode, "
                 "is another display server running?\n", tty_device);
-        goto err_close;

      ioctl(launcher->tty, VT_ACTIVATE, minor(buf.st_rdev));

More information about the wayland-devel mailing list