[Debconf-video-commits] r247 - fai-config/files/home/dvswitch/.Xsession

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-10 05:39:54 +0000 (Sun, 10 Aug 2008)
New Revision: 247

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/files/home/dvswitch/.Xsession/selma
Log:
also kill sinks on barney

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2008-08-10 05:16:45 UTC (rev 246)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2008-08-10 05:39:54 UTC (rev 247)
@@ -1,3 +1,9 @@
+# kill old sinks in case there are some left
+xterm -e ssh barney 'ps fax | grep "dvsink-files -h scratchy -p 4321"|grep -v grep|cut -d " " -f1
+| xargs -n 1 kill -9'
+xterm -e ssh daffy 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep|cut -d " " -f1  | xargs -n 1 kill -9' 
+sleep 1
+
 # setup dvswitch
 dvswitch &
 sleep 1
@@ -7,8 +13,6 @@
 sleep 1
 dvsource-file -l /home/dvswitch/loop-debconf8.dv &
 xterm -e "dc-start-sink file:barney" &
-# kill old sinks in case there are some left
-xterm -e ssh daffy 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep|cut -d " " -f1  | xargs -n1 kill -9' 
 xterm -e "dc-start-sink icecast:daffy" &
 
 # last command

Modified: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma	2008-08-10 05:16:45 UTC (rev 246)
+++ fai-config/files/home/dvswitch/.Xsession/selma	2008-08-10 05:39:54 UTC (rev 247)
@@ -1,3 +1,9 @@
+# kill old sinks in case there are some left
+xterm -e ssh barney 'ps fax | grep "dvsink-files -h selma -p 4321"|grep -v grep|cut -d " " -f1
+| xargs -n 1 kill -9'
+xterm -e ssh daffy 'ps fax | grep "bash -c dvsink-command -h selma -p 4321 -- ffmpeg2theora"|grep -v grep|cut -d " " -f1  | xargs -n 1 kill -9' 
+sleep 1
+
 # setup dvswitch
 dvswitch &
 sleep 1
@@ -7,8 +13,6 @@
 sleep 1
 dvsource-file -l /home/dvswitch/loop-debconf8.dv &
 xterm -e "dc-start-sink file:barney" &
-# kill old sinks in case there are some left
-xterm -e ssh daffy 'ps fax | grep "bash -c dvsink-command -h scratchy -p 4321 -- ffmpeg2theora"|grep -v grep|cut -d " " -f1  | xargs -n1 kill -9'
 xterm -e "dc-start-sink icecast:daffy" &
 
 # last command