mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher-direct: handle seat0 without VTs

Browse Source 
This allows launcher-direct to run when seat0 has no TTYs
This checks for a proper /dev/tty0 device as /dev/tty0
does not get created by kernels compiled with CONFIG_VT=n
This commit is contained in:
nerdopolis 2021-01-20 22:00:18 -05:00 committed by Pekka Paalanen
parent fbc065fdc5
commit 72db3ac694
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libweston/launcher-direct.c
View File

@ -304,6 +304,7 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor *
int tty, const char *seat_id, bool sync_drm) int tty, const char *seat_id, bool sync_drm)
{ {
struct launcher_direct *launcher; struct launcher_direct *launcher;
struct stat buf;
launcher = zalloc(sizeof(*launcher)); launcher = zalloc(sizeof(*launcher));
if (launcher == NULL) { if (launcher == NULL) {
@ -314,7 +315,11 @@ launcher_direct_connect(struct weston_launcher **out, struct weston_compositor *
launcher->base.iface = &launcher_direct_iface; launcher->base.iface = &launcher_direct_iface;
launcher->compositor = compositor; launcher->compositor = compositor;
if (strcmp("seat0", seat_id) == 0) { /* Checking the existance of /dev/tty0 and verifying it's a TTY
* device, as kernels compiled with CONFIG_VT=0 do not create these
* devices. */
if (stat("/dev/tty0", &buf) == 0 &&
strcmp("seat0", seat_id) == 0 && major(buf.st_rdev) == TTY_MAJOR) {
if (setup_tty(launcher, tty) == -1) { if (setup_tty(launcher, tty) == -1) {
free(launcher); free(launcher);
return -1; return -1;