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

Submitted by Florian Hänel on May 16, 2016, 10:25 p.m.

Details

Message ID 573A48CD.5010600@heeen.de
State New
Headers show
Series "weston: Don't exit just because tty is in gfx mode already" ( rev: 1 ) in Wayland

Not browsing as part of any series.

Commit Message

Florian Hänel May 16, 2016, 10:25 p.m.
From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@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(-)

Patch hide | download patch | download mbox

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));

Comments

On May 16, 2016, at 5:25 PM, Florian Hänel <florian.haenel@heeen.de> wrote:
> 
> From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@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.

Hi Florian,
Some quick feedback about the sending of the patch. See:
https://cgit.freedesktop.org/wayland/wayland/tree/doc/Contributing

Ideally, the subject line should be:
[PATCH weston] launcher-util: Don't...

And the commit message should include an "Sob" line (use the -s option with
git commit). And, are you using a non-default encoding config with git
send-email? I'm noticing that your name isn't being formatted correctly.

Regards,
yong


> ---
> 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));
> -- 
> 2.7.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel