diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2016-07-18 09:43:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:56:26 +0100 |
commit | df9f8a89fb05769c9c1968fbdbc5768086711d07 (patch) | |
tree | 898a4ffaf056f98a601d683c752db208a6cf2522 | |
parent | 9f7c1a5a99651154019f48baa0e75cdb217bd5cb (diff) | |
download | poky-df9f8a89fb05769c9c1968fbdbc5768086711d07.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.
(From OE-Core rev: 24d155d2d9be402a04fbd68b6a4ccf990deb9ce6)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-graphics/wayland/weston-init/weston-start | 7 |
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" | |||
5 | 5 | ||
6 | usage() { | 6 | usage() { |
7 | cat <<EOF | 7 | cat <<EOF |
8 | $0 <openvt arguments> -- <weston options> | 8 | $0 [<openvt arguments>] [-- <weston options>] |
9 | EOF | 9 | EOF |
10 | } | 10 | } |
11 | 11 | ||
@@ -22,11 +22,6 @@ add_openvt_argument() { | |||
22 | openvt_args="$openvt_args $1" | 22 | openvt_args="$openvt_args $1" |
23 | } | 23 | } |
24 | 24 | ||
25 | if test $# -lt 2; then | ||
26 | usage | ||
27 | exit 1 | ||
28 | fi | ||
29 | |||
30 | if [ -n "$WAYLAND_DISPLAY" ]; then | 25 | if [ -n "$WAYLAND_DISPLAY" ]; then |
31 | echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." | 26 | echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." |
32 | exit 1 | 27 | exit 1 |