diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-02-22 07:55:09 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-02-22 07:55:09 (GMT) |
| commit | 2132be6eb0e5cffa60dadadef36cdc72557e965c (patch) | |
| tree | 5147091df92693c34b2dde7b73eafc9dd1f8219f /build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root | |
| parent | f4c861dec10b2d0e11920363609ef40c5a572eac (diff) | |
| parent | 8afadf72a3bba61701d6a3ceb495fe130871dcfa (diff) | |
| download | linhes_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')
| -rwxr-xr-x | build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh | 6 | ||||
| -rwxr-xr-x | build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/startx | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh index 85762da..6acd24a 100755 --- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh +++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/root/LinHES-install.sh @@ -8,7 +8,8 @@ exec > /tmp/mythvantage_install.log #/usr/bin/tilda & #/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents & export MALLOC_CHECK_=0 - +xset s off +xset -dpms xhost + CMDLINE=$(cat /proc/cmdline) @@ -21,6 +22,7 @@ then else export CLEAN_UPGRADE=NO fi +MythVantage -r if [ x$NFSROOT = x1 ] then @@ -29,4 +31,4 @@ else NETBOOT=YES MythVantage & fi -exec fluxbox +exec fluxbox > /var/log/fluxbox.log 2>&1 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 |