diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-06-09 02:10:47 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-06-09 02:10:47 (GMT) |
| commit | b8ce64299c2a15f4db6e57d3f3435887c18e4758 (patch) | |
| tree | 9ba6e60d31fe6e21b8f991df2391f89d4d55659d /abs/core/live-installer/startx | |
| parent | 5bce8ee0fd68d6a9ffdbfeb92746b201dc994107 (diff) | |
| parent | 9c70dc6da069779c71156676e51aab607d455d9f (diff) | |
| download | linhes_pkgbuild-b8ce64299c2a15f4db6e57d3f3435887c18e4758.zip linhes_pkgbuild-b8ce64299c2a15f4db6e57d3f3435887c18e4758.tar.gz linhes_pkgbuild-b8ce64299c2a15f4db6e57d3f3435887c18e4758.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core/live-installer/startx')
| -rwxr-xr-x | abs/core/live-installer/startx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/abs/core/live-installer/startx b/abs/core/live-installer/startx deleted file mode 100755 index 0ffdf8c..0000000 --- a/abs/core/live-installer/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 |