[oe-commits] [openembedded-core] 15/16: weston-init: Use weston-launch when starting weston as the first windowing system

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 46a9d6e6781e76ac2a787d4e80a13acd64410545
Author: Tom Hochstein <tom.hochstein at nxp.com>
AuthorDate: Wed May 18 13:40:47 2016 -0300

    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 at nxp.com>
    Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-graphics/wayland/weston-init/weston-start | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 4aa7c66..72ba4b7 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.