From: Denys Dmytriyenko <[email protected]> Scripts in /etc/profile.d/* are being sourced, not executed, so they can't contain "exit" commands, otherwise the entire login session exits!
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-graphics/tslib/files/tslib.sh | 22 ++++++++++------------ .../recipes-graphics/tslib/tslib_1.1.bbappend | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh b/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh index f22ec9c..c80c946 100644 --- a/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh +++ b/meta-arago-distro/recipes-graphics/tslib/files/tslib.sh @@ -2,16 +2,14 @@ ### Touchscreen Environment Variables ### -if [ ! -e /dev/input/touchscreen0 ]; then - exit -fi - -export TSLIB_TSDEVICE=/dev/input/touchscreen0 - -mount | grep /run/media/mmcblk0p1 | grep vfat > /dev/null 2>&1 -if [ "$?" = "0" ] -then - export TSLIB_CALIBFILE=/run/media/mmcblk0p1/pointercal -else - export TSLIB_CALIBFILE=/etc/pointercal +if [ -e /dev/input/touchscreen0 ]; then + export TSLIB_TSDEVICE=/dev/input/touchscreen0 + + mount | grep /run/media/mmcblk0p1 | grep vfat > /dev/null 2>&1 + if [ "$?" = "0" ] + then + export TSLIB_CALIBFILE=/run/media/mmcblk0p1/pointercal + else + export TSLIB_CALIBFILE=/etc/pointercal + fi fi diff --git a/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend b/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend index 875218d..e3b3b38 100644 --- a/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend +++ b/meta-arago-distro/recipes-graphics/tslib/tslib_1.1.bbappend @@ -1,4 +1,4 @@ # look for files in this layer first FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -PR_append = "-arago0" +PR_append = "-arago1" -- 2.0.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
