[Debconf-video-commits] r491 - in fai-config: files/home/dvswitch/.Xsession package_config

[Holger Levsen]

Author: holger
Date: 2009-07-22 17:15:19 +0000 (Wed, 22 Jul 2009)
New Revision: 491

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/files/home/dvswitch/.Xsession/selma
   fai-config/package_config/VIDEO
Log:
x-window-system has been renamed to xorg, disable cleanup ssh calls for now

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2009-07-22 15:40:30 UTC (rev 490)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2009-07-22 17:15:19 UTC (rev 491)
@@ -4,10 +4,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
+#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 &

Modified: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma	2009-07-22 15:40:30 UTC (rev 490)
+++ fai-config/files/home/dvswitch/.Xsession/selma	2009-07-22 17:15:19 UTC (rev 491)
@@ -1,8 +1,7 @@
 # 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
+#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 &

Modified: fai-config/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO	2009-07-22 15:40:30 UTC (rev 490)
+++ fai-config/package_config/VIDEO	2009-07-22 17:15:19 UTC (rev 491)
@@ -8,7 +8,7 @@
 telnet
 
 PACKAGES install XORG
-x-window-system elinks
+xorg elinks
 xfce4 xserver-xorg xterm kdm
 xserver-xorg-video-intel
 iceweasel mozilla-noscript mozilla-firefox-adblock