mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
qtdemo-init: Make qtdemo startup correctly
The qtdemo can't launch via qtdemo-init initscript. Fix it. (From OE-Core rev: bdd7a07db6b41c6c87c272d410af63c2d0251fc8) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user