Revert "weston-init: Pass --continue-without-input when launching weston"

Message ID 20211130032705.3313502-1-raj.khem@gmail.com
State Accepted, archived
Commit 6b7d8b2a141cc79272010b24d0648e6238fa4c74
Headers show
Series Revert "weston-init: Pass --continue-without-input when launching weston" | expand

Commit Message

Khem Raj Nov. 30, 2021, 3:27 a.m. UTC
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 <raj.khem@gmail.com>
---
 meta/recipes-graphics/wayland/weston-init/init           | 2 +-
 meta/recipes-graphics/wayland/weston-init/weston.service | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index f74ac8b1846..a849f29bcbd 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 c7583e92e6e..e09625b31c6 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