diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/weston-init/weston-start')
| -rwxr-xr-x | meta/recipes-graphics/wayland/weston-init/weston-start | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start index ccc7093425..97471df80d 100755 --- a/meta/recipes-graphics/wayland/weston-init/weston-start +++ b/meta/recipes-graphics/wayland/weston-init/weston-start | |||
| @@ -23,6 +23,15 @@ add_openvt_argument() { | |||
| 23 | openvt_args="$openvt_args $1" | 23 | openvt_args="$openvt_args $1" |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | ## Add module to --modules argument | ||
| 27 | add_weston_module() { | ||
| 28 | if [ -z "${weston_modules}" ]; then | ||
| 29 | weston_modules="--modules " | ||
| 30 | fi; | ||
| 31 | weston_modules="${weston_modules}${1}," | ||
| 32 | } | ||
| 33 | |||
| 34 | |||
| 26 | if [ -n "$WAYLAND_DISPLAY" ]; then | 35 | if [ -n "$WAYLAND_DISPLAY" ]; then |
| 27 | echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." | 36 | echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." |
| 28 | exit 1 | 37 | exit 1 |
| @@ -65,6 +74,9 @@ if [ -d "$modules_dir" ]; then | |||
| 65 | # process module | 74 | # process module |
| 66 | . $m | 75 | . $m |
| 67 | done | 76 | done |
| 77 | if [ -n "${weston_modules}" ]; then | ||
| 78 | add_weston_argument "${weston_modules} " | ||
| 79 | fi; | ||
| 68 | fi | 80 | fi |
| 69 | 81 | ||
| 70 | if test -z "$XDG_RUNTIME_DIR"; then | 82 | if test -z "$XDG_RUNTIME_DIR"; then |
