From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Mon, 18 Jul 2016 14:43:05 +0000 (-0500)
Subject: weston-init: Fix weston-start to handle 0 or 1 args
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~24923
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24d155d2d9be402a04fbd68b6a4ccf990deb9ce6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

weston-init: Fix weston-start to handle 0 or 1 args

The parser incorrectly treated anything less than 2 args as an error.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 3508ae2c339..9ef6773b0e8 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -5,7 +5,7 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
 usage() {
     cat <<EOF
-    $0 <openvt arguments> -- <weston options>
+    $0 [<openvt arguments>] [-- <weston options>]
 EOF
 }
 
@@ -22,11 +22,6 @@ add_openvt_argument() {
 	openvt_args="$openvt_args $1"
 }
 
-if test $# -lt 2; then
-	usage
-	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