From e05f228a5f60bdd41edfd92b12731a42110a5743 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 2 Oct 2013 13:06:02 -0700 Subject: [PATCH] launcher: Print a more descriptive error message when we don't get a VT weston-launch has two supported use cases now: either launch from and VT login as a regular user (running within that session) or from an init script (systemd or such) with the -u option to create a session for the specified user. Running from within X or ssh is not possible. It's still possible to run weston as root from X or ssh but that's strictly a development/debug/test feature. https://bugs.freedesktop.org/show_bug.cgi?id=69727 --- src/weston-launch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/weston-launch.c b/src/weston-launch.c index 1b560af..49b8964 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -492,6 +492,10 @@ setup_tty(struct weston_launch *wl, const char *tty) if (wl->tty < 0) error(1, errno, "failed to open tty"); + if (fstat(wl->tty, &buf) == -1 || + major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) + error(1, 0, "weston-launch must be run from a virtual terminal"); + if (tty) { if (fstat(wl->tty, &buf) < 0) error(1, errno, "stat %s failed", tty); -- 2.7.4