From: Khem Raj Date: Tue, 30 Nov 2021 03:27:05 +0000 (-0800) Subject: Revert "weston-init: Pass --continue-without-input when launching weston" X-Git-Tag: uninative-3.5~657 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6b7d8b2a141cc79272010b24d0648e6238fa4c74;p=openembedded-core.git 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. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- 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 . /etc/profile export HOME=ROOTHOME - weston-start -- --continue-without-input $OPTARGS + weston-start -- $OPTARGS ;; 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 # Requires systemd-notify.so Weston plugin. Type=notify EnvironmentFile=/etc/default/weston -ExecStart=/usr/bin/weston --continue-without-input --modules=systemd-notify.so +ExecStart=/usr/bin/weston --modules=systemd-notify.so # Optional watchdog setup TimeoutStartSec=60