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

compositor-drm: Fail, and fail early if we can't set up the tty

Browse Source 
Typically a permissions problem.  Weston should be setuid root or
be launched by a setuid helper.
This commit is contained in:
Kristian Høgsberg
2012-01-15 14:29:09 -05:00
parent 00513ab7cc
commit c5b9ddb610
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+8 -2
View File
@@ -840,6 +840,14 @@ drm_compositor_create(struct wl_display *display,
return NULL; return NULL;
} }
ec->base.wl_display = display;
ec->tty = tty_create(&ec->base, vt_func, tty);
if (!ec->tty) {
fprintf(stderr, "failed to initialize tty\n");
free(ec);
return NULL;
}
e = udev_enumerate_new(ec->udev); e = udev_enumerate_new(ec->udev);
udev_enumerate_add_match_subsystem(e, "drm"); udev_enumerate_add_match_subsystem(e, "drm");
udev_enumerate_add_match_sysname(e, "card[0-9]*"); udev_enumerate_add_match_sysname(e, "card[0-9]*");
@@ -865,7 +873,6 @@ drm_compositor_create(struct wl_display *display,
return NULL; return NULL;
} }
ec->base.wl_display = display;
if (init_egl(ec, drm_device) < 0) { if (init_egl(ec, drm_device) < 0) {
fprintf(stderr, "failed to initialize egl\n"); fprintf(stderr, "failed to initialize egl\n");
return NULL; return NULL;
@@ -901,7 +908,6 @@ drm_compositor_create(struct wl_display *display,
ec->drm_source = ec->drm_source =
wl_event_loop_add_fd(loop, ec->drm.fd, wl_event_loop_add_fd(loop, ec->drm.fd,
WL_EVENT_READABLE, on_drm_input, ec); WL_EVENT_READABLE, on_drm_input, ec);
ec->tty = tty_create(&ec->base, vt_func, tty);
ec->udev_monitor = udev_monitor_new_from_netlink(ec->udev, "udev"); ec->udev_monitor = udev_monitor_new_from_netlink(ec->udev, "udev");
if (ec->udev_monitor == NULL) { if (ec->udev_monitor == NULL) {