From 646d8f4ded09aea4a6a512538ab11810c38ac746 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 18 Jul 2013 19:45:01 +0200 Subject: [PATCH] xstartup --- tcserver/conf/home/vnc/xstartup | 2 +- tcserver/conf/home/vnc/xstartup.ubuntu | 16 ---------------- tcserver/install.py | 1 + 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100755 tcserver/conf/home/vnc/xstartup.ubuntu diff --git a/tcserver/conf/home/vnc/xstartup b/tcserver/conf/home/vnc/xstartup index 416bd91..ce84087 100755 --- 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 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 f51010a..504ffe7 100644 --- 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') -- 2.39.5