summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-05-18 13:40:47 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:21:30 +0100
commit76ed534267ed16677eeb86b85670338a1064a733 (patch)
tree47945969c93adbbe8e2af78cfef35ac49283ef64
parent4bbb5d5c0a4bed12622d06cd918ecd4d9db68b5e (diff)
downloadopenembedded-core-contrib-76ed534267ed16677eeb86b85670338a1064a733.tar.gz
openembedded-core-contrib-76ed534267ed16677eeb86b85670338a1064a733.tar.bz2
openembedded-core-contrib-76ed534267ed16677eeb86b85670338a1064a733.zip
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. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start7
1 files changed, 6 insertions, 1 deletions
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