summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-05-18 13:40:44 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:21:30 +0100
commit2332f93ae88ca4e4a5aac1806f21104b6489b3bb (patch)
tree42763108387f82f29235ec03fdf76ef8d5e7308e
parent1963dfb002b9e0b4bff02dbf783909102ca59719 (diff)
downloadopenembedded-core-contrib-2332f93ae88ca4e4a5aac1806f21104b6489b3bb.tar.gz
openembedded-core-contrib-2332f93ae88ca4e4a5aac1806f21104b6489b3bb.tar.bz2
openembedded-core-contrib-2332f93ae88ca4e4a5aac1806f21104b6489b3bb.zip
weston-init: Error out if loading a nested instance
The Weston nested instance support is not implemented. This errors out displaying an informative error message so someone insterested on it may look at implement this later. 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-start5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index b791fd5a9b..dc2b1efc78 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -14,6 +14,11 @@ if test $# -lt 2; then
exit 1
fi
+if [ -n "$WAYLAND_DISPLAY" ]; then
+ echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
+ exit 1
+fi
+
openvt_args=""
while [ -n "$1" ]; do
openvt_args="$openvt_args $1"