From 5fb0c1edcee0b267cb4f5191002898f70675baa0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 18 May 2016 13:40:47 -0300 Subject: weston-init: Use weston-launch when starting weston as the first windowing system When weston is started as the first windowing system (i.e. not under X nor under another Wayland server), it should be done with the command weston-launch to set up proper privileged access to devices. (From OE-Core rev: 76ed534267ed16677eeb86b85670338a1064a733) Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/weston-start | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start index 4aa7c66d3b..72ba4b7079 100755 --- a/meta/recipes-graphics/wayland/weston-init/weston-start +++ b/meta/recipes-graphics/wayland/weston-init/weston-start @@ -31,6 +31,11 @@ if [ -n "$WAYLAND_DISPLAY" ]; then echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." exit 1 fi +if [ -n "$DISPLAY" ]; then + launcher="weston" +else + launcher="weston-launch --" +fi openvt_args="" while [ -n "$1" ]; do @@ -64,4 +69,4 @@ if test -z "$XDG_RUNTIME_DIR"; then chmod 0700 $XDG_RUNTIME_DIR fi -exec openvt $openvt_args -- weston $weston_args --log=/var/log/weston.log +exec openvt $openvt_args -- $launcher $weston_args --log=/var/log/weston.log -- cgit 1.2.3-korg