[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1533/8267] weston-init: Fix weston-start to handle 0 or 1 args



commit df9f8a89fb05769c9c1968fbdbc5768086711d07
Author: Tom Hochstein <tom hochstein nxp com>
Date:   Mon Jul 18 09:43:05 2016 -0500

    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>

 .../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 3508ae2..9ef6773 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]