diff options
| author | Michael Hanson <mihanson@linhes.org> | 2011-11-04 19:21:13 (GMT) |
|---|---|---|
| committer | Michael Hanson <mihanson@linhes.org> | 2011-11-04 19:21:13 (GMT) |
| commit | 94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a (patch) | |
| tree | 27c63c2fa679256dbc46bbff241c41db98e9d244 /abs/core/LinHES-config-svn/startx | |
| parent | e3a0f9ba95aa059d76a57c7821a5ccc6a80a5f84 (diff) | |
| parent | 67989fe1be117ac23fa3a98acbc2794a17d7d0ed (diff) | |
| download | linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.zip linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.gz linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/LinHES-config-svn/startx')
| -rwxr-xr-x | abs/core/LinHES-config-svn/startx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/abs/core/LinHES-config-svn/startx b/abs/core/LinHES-config-svn/startx deleted file mode 100755 index 0ffdf8c..0000000 --- a/abs/core/LinHES-config-svn/startx +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 -- -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 |