summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-07-18 09:43:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:46:57 +0100
commitfba47b9d881af40eb2462aefd19040dc08314365 (patch)
tree0c6f2b9c64957a33388ad0cf06e14299c631bfd3
parent24d155d2d9be402a04fbd68b6a4ccf990deb9ce6 (diff)
downloadopenembedded-core-fba47b9d881af40eb2462aefd19040dc08314365.tar.gz
openembedded-core-fba47b9d881af40eb2462aefd19040dc08314365.tar.bz2
openembedded-core-fba47b9d881af40eb2462aefd19040dc08314365.zip
weston-init: De-couple framebuffer console from Weston for systemd startup
The framebuffer console was using the same I/O as Weston. We fix this by having openvt switch to the new VT when starting weston-launch, same as is already done for the sysvinit case. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/wayland/weston-init/init2
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index 5c925f4541..d3e87c6cef 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/meta/recipes-graphics/wayland/weston-init/init
@@ -31,7 +31,7 @@ case "$1" in
start)
. /etc/profile
- weston-start -s -- $OPTARGS
+ weston-start -- $OPTARGS
;;
stop)
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 9ef6773b0e..e72fbaaac4 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -1,5 +1,6 @@
#!/bin/sh
# Copyright (C) 2016 O.S. Systems Software LTDA.
+# Copyright (C) 2016 Freescale Semiconductor
export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
@@ -32,7 +33,7 @@ else
launcher="weston-launch --"
fi
-openvt_args=""
+openvt_args="-s"
while [ -n "$1" ]; do
if [ "$1" = "--" ]; then
shift