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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index f74ac8b1846b0e18a0e12756ef73ec466d089c96..a849f29bcbd85c6d30d2ef4e061ef332ea555450 100644 (file)
--- 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 c7583e92e6e4fdae4f3685e1f2ba1c593bdd4946..e09625b31c6dbe7121665a554e26e267b809beb1 100644 (file)
--- 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