From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 8 Dec 2014 13:48:38 +0000 (+0100)
Subject: fix deamons, increase sleeps
X-Git-Tag: 1.0~2^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c59c0879cbe0eb3267b6b371590f917d7d0df74;p=telecaster-server.git

fix deamons, increase sleeps
---

diff --git a/conf/home/telecaster/.fluxbox/autostart.sh b/conf/home/telecaster/.fluxbox/autostart.sh
index a36109f..79220c3 100755
--- a/conf/home/telecaster/.fluxbox/autostart.sh
+++ b/conf/home/telecaster/.fluxbox/autostart.sh
@@ -61,7 +61,7 @@ jack_disconnect system:capture_2 gst-launch-0.10-01:in_jackaudiosrc0_2
 jack_connect jack_rack:out_1 gst-launch-0.10-01:in_jackaudiosrc0_1
 jack_connect jack_rack:out_2 gst-launch-0.10-01:in_jackaudiosrc0_2
 
-sleep 1
+sleep 8
 
 #Audio monitor
 deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml &
diff --git a/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full b/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full
index ecc3dc7..e3ef96f 100755
--- a/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full
+++ b/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-sudo /etc/init.d/telecaster-audio stop
-sudo /etc/init.d/telecaster-video stop
-sudo /etc/init.d/telecaster-vnc stop
+sudo /etc/init.d/telecaster stop
 sudo /etc/init.d/stream-m stop
 sudo /etc/init.d/jackd stop
 
@@ -10,9 +8,4 @@ sleep 3
 
 sudo /etc/init.d/jackd start
 sudo /etc/init.d/stream-m start
-sudo /etc/init.d/telecaster-vnc start
-
-sleep 10
-
-sudo /etc/init.d/telecaster-audio start
-sudo /etc/init.d/telecaster-video start
+sudo /etc/init.d/telecaster start
diff --git a/install.py b/install.py
index ae59474..f036c42 100644
--- a/install.py
+++ b/install.py
@@ -143,7 +143,7 @@ class Install(object):
 
         os.system('update-rc.d jackd defaults 30 30')
         os.system('update-rc.d stream-m defaults 20 20')
-        os.system('update-rc.d telecaster-vnc defaults 80 15')
+        os.system('update-rc.d telecaster defaults 99 15')
 
         os.system('chmod 777 ' + self.m3u_dir)
         os.system('chmod 666 ' + self.m3u_dir + '/*')