summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver8
-rw-r--r--meta/packages/x11-common/xserver-nodm-init.bb4
2 files changed, 4 insertions, 8 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
index 9a0986ad6..3d4aa74b9 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver
@@ -30,12 +30,9 @@ ARGS=" -br -pn"
if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
- . /etc/formfactor/config
+ . /etc/formfactor/config
- # use ucb 1x00 touchscreen if present
- if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
- ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
- fi
+ ARGS="$ARGS -keybd keyboard"
# use usb mouse if present
if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
@@ -78,4 +75,3 @@ fi
DISPLAY=':0'
exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
-
diff --git a/meta/packages/x11-common/xserver-nodm-init.bb b/meta/packages/x11-common/xserver-nodm-init.bb
index c9efb71b8..c77b2f0f8 100644
--- a/meta/packages/x11-common/xserver-nodm-init.bb
+++ b/meta/packages/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
-PR = "r21"
+PR = "r22"
RDEPENDS_${PN} = "dbus-wait sudo"
SRC_URI = "file://xserver-nodm"
@@ -14,7 +14,7 @@ do_install() {
install -d ${D}/etc
install -d ${D}/etc/init.d
install xserver-nodm ${D}/etc/init.d
-}
+}
inherit update-rc.d