diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-11-25 18:40:21 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-11-25 18:40:21 (GMT) |
| commit | f9d8baf1e8d94e1252cbd90999d9f2382cff8a57 (patch) | |
| tree | 1424c8c8b9ac2cc086ce7376ec85446ff48919fc /abs/core-testing/LinHES-config-22/startx | |
| parent | b0fcb5694aa74b1098dc1647fa272c157d24b856 (diff) | |
| parent | 1e4ef029d3646f3e86bc2a725cbed7ac1e3e6613 (diff) | |
| download | linhes_pkgbuild-f9d8baf1e8d94e1252cbd90999d9f2382cff8a57.zip linhes_pkgbuild-f9d8baf1e8d94e1252cbd90999d9f2382cff8a57.tar.gz linhes_pkgbuild-f9d8baf1e8d94e1252cbd90999d9f2382cff8a57.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config-22/startx')
| -rwxr-xr-x | abs/core-testing/LinHES-config-22/startx | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/abs/core-testing/LinHES-config-22/startx b/abs/core-testing/LinHES-config-22/startx new file mode 100755 index 0000000..75ba06a --- /dev/null +++ b/abs/core-testing/LinHES-config-22/startx @@ -0,0 +1,29 @@ +#!/bin/bash +. /etc/profile + +export USER=root +export HOME=/root +#TEMPLATES=/usr/share/templates + +CMDLINE=$(cat /proc/cmdline) +TEMPVAR=${CMDLINE#*ip=} +IP=${TEMPVAR%% *} +echo $CMDLINE |grep -q vnc +USEVNC=$? + +if [ x$USEVNC = x1 ] +then + $MV_ROOT/bin/xconfig.sh + cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install + startx /root/live-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail + else + #VNC + pacman -Sf --noconfirm tightvnc + cd /root + mkdir .vnc + echo mythvantage |vncpasswd -f > /root/.vnc/passwd + chmod 500 /root/.vnc/passwd + rm /root/.vnc/xstartup + ln -s /root/live-install.sh /root/.vnc/xstartup + vncserver +fi |