fix deamons, increase sleeps

diff --git a/conf/home/telecaster/.fluxbox/autostart.sh b/conf/home/telecaster/.fluxbox/autostart.sh
index a36109ffa80d65125725cb64c44f6f13b6e9be3b..79220c3bd508ea647c97444829167b95be72185f 100755 (executable)
--- 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 ecc3dc7726ab48c9bbc9ad33aa7ab0c3722bf5e7..e3ef96f84bcba3aef6415245ced7eebbed84ff75 100755 (executable)
--- 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 ae594741a88638e755e84eac87ee1cec3cd6c390..f036c42a3eec169155568eb579e8c11a3afb027a 100644 (file)
--- 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 + '/*')