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

weston-launch: do not close tty prematurely

Browse Source 
The tty file descriptor is used in signal handling (when switching
VT via SIGUSR1/SIGUSR2 for the VT_RELDISP ioctrl) and in quit() when
weston-launch exits for the KDSKBMUTE/KDSKBMODE/KDSETMODE/VT_SETMODE
ioctrls.

This fixes VT switching when using weston-launch from a non-VT shell
(e.g. ssh or from within a container).

Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
Stefan Agner
2019-11-14 22:07:27 +01:00
committed by Pekka Paalanen
parent 7df5349763
commit aaa5b82e61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/weston-launch.c
+3 -2
View File
@@ -457,6 +457,9 @@ quit(struct weston_launch *wl, int status)
if (ioctl(wl->tty, VT_SETMODE, &mode) < 0) if (ioctl(wl->tty, VT_SETMODE, &mode) < 0)
fprintf(stderr, "could not reset vt handling\n"); fprintf(stderr, "could not reset vt handling\n");
if (wl->tty != STDIN_FILENO)
close(wl->tty);
exit(status); exit(status);
} }
@@ -847,8 +850,6 @@ main(int argc, char *argv[])
launch_compositor(&wl, argc - optind, argv + optind); launch_compositor(&wl, argc - optind, argv + optind);
close(wl.sock[1]); close(wl.sock[1]);
if (wl.tty != STDIN_FILENO)
close(wl.tty);
while (1) { while (1) {
struct pollfd fds[2]; struct pollfd fds[2];