Index: client/deps/factory/startx.sh |
diff --git a/client/deps/factory/startx.sh b/client/deps/factory/startx.sh |
index 52a5917ee9af00859e7fef5db3cafe2558119d7e..543f9d393a111fa6ebcd34203b01fcdd1aafd8ad 100755 |
--- a/client/deps/factory/startx.sh |
+++ b/client/deps/factory/startx.sh |
@@ -21,7 +21,7 @@ ${XAUTH} -q -f ${XAUTH_FILE} add ${DISPLAY} . ${MCOOKIE} |
/bin/sh -c "\ |
trap '' USR1 TTOU TTIN |
exec /usr/bin/X11/X -nolisten tcp vt01 -auth ${XAUTH_FILE} \ |
--s 0 -p 0 -dpms 2> /dev/null" & |
+-r -s 0 -p 0 -dpms 2> /dev/null" & |
while [ -z ${SERVER_READY} ]; do |
sleep .1 |
@@ -30,12 +30,13 @@ done |
export DISPLAY=${DISPLAY} |
export XAUTHORITY=${XAUTH_FILE} |
+# TODO : move this to ExtDisplay test |
# TODO : currently necessary as ch7036 stuff only launches if upstart ui but in |
# future it will be tied to udev |
-if [ -e /usr/bin/ch7036_monitor ] ; then |
- /sbin/modprobe i2c-dev |
- /usr/bin/ch7036_monitor -v > /var/log/factory_ch7036_monitor.log & |
-fi |
+#if [ -e /usr/bin/ch7036_monitor ] ; then |
+# /sbin/modprobe i2c-dev |
+# /usr/bin/ch7036_monitor -v > /var/log/factory_ch7036_monitor.log & |
+#fi |
/sbin/initctl emit factory-ui-started |
cat /proc/uptime > /tmp/uptime-x-started |