summaryrefslogtreecommitdiffstats
path: root/build_tools/archiso/mythvantage/root-image/root/startx
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-09-05 19:01:07 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-09-05 19:01:07 (GMT)
commitbfa7dca8c393b0a54b6dda5301e8725a3aeecfb3 (patch)
tree77be472c218be69da116cd00862671e45540b983 /build_tools/archiso/mythvantage/root-image/root/startx
parent6460f7b4846030b1ace3264c2e18a0ad08b99944 (diff)
downloadlinhes_dev-bfa7dca8c393b0a54b6dda5301e8725a3aeecfb3.zip
mkarchiso configs
Diffstat (limited to 'build_tools/archiso/mythvantage/root-image/root/startx')
-rwxr-xr-xbuild_tools/archiso/mythvantage/root-image/root/startx37
1 files changed, 37 insertions, 0 deletions
diff --git a/build_tools/archiso/mythvantage/root-image/root/startx b/build_tools/archiso/mythvantage/root-image/root/startx
new file mode 100755
index 0000000..ca11cdc
--- /dev/null
+++ b/build_tools/archiso/mythvantage/root-image/root/startx
@@ -0,0 +1,37 @@
+#!/bin/bash
+. /etc/profile
+
+export USER=root
+export HOME=/root
+
+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 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 -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail 2>/tmp/x.log
+ startx /root/LinHES-install.sh -- -logverbose 6 -allowMouseOpenFail 2>/tmp/x.log
+ else
+ #VNC
+ pacman -Sf --noconfirm tigervnc
+ /etc/rc.d/dbus start
+ cp -f $TEMPLATES/vnc.service /etc/avahi/services/
+ /etc/rc.d/avahi-daemon start
+ cd /root
+ mkdir .vnc
+ echo 54321 |vncpasswd -f > /root/.vnc/passwd
+ chmod 500 /root/.vnc/passwd
+ rm -f /root/.vnc/xstartup 2>/dev/null
+ ln -s /root/LinHES-install.sh /root/.vnc/xstartup
+ vncserver
+ echo "The VNC server password is: 54321"
+ echo "Please connect to one of these ip's"
+ echo "-------------------------------------------"
+ ip addr show |grep "inet" |grep -v inet6|cut -d\/ -f1
+ echo "-------------------------------------------"
+fi