summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2013-04-04 21:36:20 -0400
committerKristian Høgsberg <krh@bitplanet.net>2013-04-04 21:36:20 -0400
commitb76237e508d7440ce3f210b03d03f09723506436 (patch)
tree6fe21baf54f4b29d876c9d2ebdbdd764741c202e
parenteb3c73f2882bbe1c89c912924d5bdea4c909f4b7 (diff)
downloadweston-b76237e508d7440ce3f210b03d03f09723506436.tar.gz
compositor-drm: Allow running without launcher if effective UID is 0
This lets us keep running weston as root or setuid root.
-rw-r--r--src/compositor-drm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 6e0a126d..5fccace9 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -2167,9 +2167,9 @@ drm_compositor_create(struct wl_display *display,
}
/* Check if we run drm-backend using weston-launch */
- if (ec->base.launcher_sock == -1) {
+ if (ec->base.launcher_sock == -1 && geteuid() != 0) {
weston_log("fatal: drm backend should be run "
- "using weston-launch binary\n");
+ "using weston-launch binary or as root\n");
goto err_compositor;
}