xstartup

diff --git a/tcserver/conf/home/vnc/xstartup b/tcserver/conf/home/vnc/xstartup
index 416bd911fb2a6b413f3d8855d613e91bbd82e2ab..ce840875204e8701de3fe47469edd82feca48b8d 100755 (executable)
--- a/tcserver/conf/home/vnc/xstartup
+++ b/tcserver/conf/home/vnc/xstartup
@@ -12,5 +12,5 @@ vncconfig -iconic &
 #x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
 #x-window-manager &
 #jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
-fluxbox &
+startfluxbox &
 

diff --git a/tcserver/conf/home/vnc/xstartup.ubuntu b/tcserver/conf/home/vnc/xstartup.ubuntu
deleted file mode 100755 (executable)
index ce84087..0000000
--- a/tcserver/conf/home/vnc/xstartup.ubuntu
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Uncomment the following two lines for normal desktop:
-# unset SESSION_MANAGER
-# exec /etc/X11/xinit/xinitrc
-
-[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-xsetroot -solid grey
-#xset s 0
-vncconfig -iconic &
-#x-terminal-emulator -geometry 80x24+10+10 -ls -title "$VNCDESKTOP Desktop" &
-#x-window-manager &
-#jackd -R -dalsa -r44100 -p2048 -n4 -D -Chw:0,1 -Phw:0,1 -S &
-startfluxbox &
-

diff --git a/tcserver/install.py b/tcserver/install.py
index f51010a5585fbec4def2ea767bfa5b6e469a3142..504ffe71d8fb73820c198fead2331874767ed983 100644 (file)
--- a/tcserver/install.py
+++ b/tcserver/install.py
@@ -128,6 +128,7 @@ class Install(object):
         os.system('sudo update-rc.d -f jackd remove')
         os.system('sudo update-rc.d -f stream-m remove')
         os.system('sudo update-rc.d -f vncserver remove')
+        os.system('sudo update-rc.d -f telecaster remove')
 
         os.system('update-rc.d jackd defaults 30 30')
         os.system('update-rc.d stream-m defaults 20 20')