diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-27 11:44:42 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-27 11:44:42 +0100 |
commit | 8f32595f6b8ed885a8291b1eb5cd671ece4b7d58 (patch) | |
tree | 118f54c8a15e29bb0026ba62d0dfc2e469162724 /meta/packages/x11-common/x11-common/etc/X11/Xserver | |
parent | 5c96414966b7b92bc1877b463c082bd13e8f6d57 (diff) | |
download | poky-8f32595f6b8ed885a8291b1eb5cd671ece4b7d58.tar.gz |
x11-common: Remove unused Xinit file, remove hardcoded user assumptions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/x11-common/x11-common/etc/X11/Xserver')
-rw-r--r-- | meta/packages/x11-common/x11-common/etc/X11/Xserver | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver index 689d522d09..9a0986ad61 100644 --- a/meta/packages/x11-common/x11-common/etc/X11/Xserver +++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver | |||
@@ -1,8 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | 3 | ||
4 | . /etc/formfactor/config | ||
5 | |||
6 | # note xinit needs full server path | 4 | # note xinit needs full server path |
7 | XSERVER=/usr/bin/Xipaq | 5 | XSERVER=/usr/bin/Xipaq |
8 | if [ -f /usr/bin/Xfbdev ]; then | 6 | if [ -f /usr/bin/Xfbdev ]; then |
@@ -28,12 +26,12 @@ module_id() { | |||
28 | awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo | 26 | awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo |
29 | } | 27 | } |
30 | 28 | ||
31 | export USER=root | ||
32 | |||
33 | ARGS=" -br -pn" | 29 | ARGS=" -br -pn" |
34 | 30 | ||
35 | if [ "$XSERVER" != "/usr/bin/Xorg" ]; then | 31 | if [ "$XSERVER" != "/usr/bin/Xorg" ]; then |
36 | 32 | ||
33 | . /etc/formfactor/config | ||
34 | |||
37 | # use ucb 1x00 touchscreen if present | 35 | # use ucb 1x00 touchscreen if present |
38 | if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then | 36 | if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then |
39 | ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" | 37 | ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" |