From bdd7a07db6b41c6c87c272d410af63c2d0251fc8 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 18 Sep 2014 17:05:47 +0800 Subject: qtdemo-init: Make qtdemo startup correctly The qtdemo can't launch via qtdemo-init initscript. Fix it. Signed-off-by: Yi Zhao Signed-off-by: Ross Burton --- meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init index 3a1f2cb1b2..21f0273e2a 100644 --- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init +++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init @@ -2,8 +2,8 @@ set -e -if [ -f /usr/bin/qtdemo ]; then - QTDEMO="qtdemo > /var/log/Xsession.log 2> &1" +if [ -x /usr/bin/qtdemo ]; then + QTDEMO="qtdemo" else QTDEMO="qtdemoE -qws" fi @@ -18,7 +18,7 @@ case "$1" in if [ ! -f /etc/pointercal ]; then /usr/bin/ts_calibrate fi - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then Xorg & export DISPLAY=:0 $QTDEMO & @@ -26,7 +26,7 @@ case "$1" in QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & fi else - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then Xorg & export DISPLAY=:0 fi @@ -35,7 +35,7 @@ case "$1" in ;; stop) echo "Stopping qtdemo" - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then killall Xorg killall qtdemo else -- cgit 1.2.3-korg