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

launcher-logind: handle any seat without VTs

Browse Source 
Instead of assuming that seat0 has TTYs, use logind to check if
the seat has TTYs
This commit is contained in:
nerdopolis
2021-01-20 22:00:44 -05:00
committed by Pekka Paalanen
parent 72db3ac694
commit 9cb96f8353
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/launcher-logind.c
+6 -2
View File
@@ -779,9 +779,9 @@ launcher_logind_connect(struct weston_launcher **out, struct weston_compositor *
goto err_session; goto err_session;
} }
r = strcmp(t, "seat0"); r = sd_seat_can_tty(t);
free(t); free(t);
if (r == 0) { if (r > 0) {
r = weston_sd_session_get_vt(wl->sid, &wl->vtnr); r = weston_sd_session_get_vt(wl->sid, &wl->vtnr);
if (r < 0) { if (r < 0) {
weston_log("logind: session not running on a VT\n"); weston_log("logind: session not running on a VT\n");
@@ -792,6 +792,10 @@ launcher_logind_connect(struct weston_launcher **out, struct weston_compositor *
r = -EINVAL; r = -EINVAL;
goto err_session; goto err_session;
} }
} else if (r < 0) {
weston_log("logind: could not determine if seat %s has ttys or not", t);
r = -EINVAL;
goto err_session;
} }
loop = wl_display_get_event_loop(compositor->wl_display); loop = wl_display_get_event_loop(compositor->wl_display);