aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-07-18 09:43:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:46:57 +0100
commit24d155d2d9be402a04fbd68b6a4ccf990deb9ce6 (patch)
tree13d570713eed0ae375b660e1c0c6b44dfb73ee00
parent84dc6a5b277b977488a5dda39feeff3482dfafe3 (diff)
downloadopenembedded-core-contrib-24d155d2d9be402a04fbd68b6a4ccf990deb9ce6.tar.gz
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>
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start7
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 3508ae2c33..9ef6773b0e 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