summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-02-22 07:55:09 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-02-22 07:55:09 (GMT)
commit2132be6eb0e5cffa60dadadef36cdc72557e965c (patch)
tree5147091df92693c34b2dde7b73eafc9dd1f8219f /build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
parentf4c861dec10b2d0e11920363609ef40c5a572eac (diff)
parent8afadf72a3bba61701d6a3ceb495fe130871dcfa (diff)
downloadlinhes_dev-2132be6eb0e5cffa60dadadef36cdc72557e965c.zip
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-dev
Diffstat (limited to 'build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx')
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
index 304b722..58858d8 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx
@@ -12,9 +12,9 @@ USEVNC=$?
if [ x$USEVNC = x1 ]
then
- $MV_ROOT/bin/xconfig.sh
+ $MV_ROOT/bin/xconfig.sh 2>/dev/null
cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install
- startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail
+ startx /root/LinHES-install.sh -- -config /root/xorg.conf.install -allowMouseOpenFail 2>/tmp/x.log
else
#VNC
pacman -Sf --noconfirm tightvnc