summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-11-29 19:27:05 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-01 16:23:45 +0000
commit0e733283f69b2ba07c89711df5c8ac57d7af04c3 (patch)
tree2f1dbbe061653969a4f8e744dde3d577cf7fc1fe /meta
parent95de7e2b62527f10f6dc9e9b79b12161969bc67a (diff)
downloadpoky-0e733283f69b2ba07c89711df5c8ac57d7af04c3.tar.gz
Revert "weston-init: Pass --continue-without-input when launching weston"
This reverts commit 762a20b493cc219a46d9ac188fe4895a111ee7b4. This breaks machines using fbdev backend, since this option is drm backend specific, we need to know the backend before using it, until we have a smart way to detect that, this will not be a fool proof solution, therefore revert it for now. (From OE-Core rev: 6b7d8b2a141cc79272010b24d0648e6238fa4c74) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston-init/init2
-rw-r--r--meta/recipes-graphics/wayland/weston-init/weston.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index f74ac8b184..a849f29bcb 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/meta/recipes-graphics/wayland/weston-init/init
@@ -32,7 +32,7 @@ case "$1" in
32 . /etc/profile 32 . /etc/profile
33 export HOME=ROOTHOME 33 export HOME=ROOTHOME
34 34
35 weston-start -- --continue-without-input $OPTARGS 35 weston-start -- $OPTARGS
36 ;; 36 ;;
37 37
38 stop) 38 stop)
diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service
index c7583e92e6..e09625b31c 100644
--- a/meta/recipes-graphics/wayland/weston-init/weston.service
+++ b/meta/recipes-graphics/wayland/weston-init/weston.service
@@ -34,7 +34,7 @@ ConditionPathExists=/dev/tty0
34# Requires systemd-notify.so Weston plugin. 34# Requires systemd-notify.so Weston plugin.
35Type=notify 35Type=notify
36EnvironmentFile=/etc/default/weston 36EnvironmentFile=/etc/default/weston
37ExecStart=/usr/bin/weston --continue-without-input --modules=systemd-notify.so 37ExecStart=/usr/bin/weston --modules=systemd-notify.so
38 38
39# Optional watchdog setup 39# Optional watchdog setup
40TimeoutStartSec=60 40TimeoutStartSec=60