[Debconf-video-commits] r623 - in fai-config: files/home/dvswitch/.Xsession scripts/DEBCONF10

[Holger Levsen]

Author: holger
Date: 2010-08-03 15:47:50 +0000 (Tue, 03 Aug 2010)
New Revision: 623

Modified:
   fai-config/files/home/dvswitch/.Xsession/scratchy
   fai-config/scripts/DEBCONF10/60-fstab
Log:
fix stupid typo

Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-03 05:10:20 UTC (rev 622)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy	2010-08-03 15:47:50 UTC (rev 623)
@@ -25,7 +25,7 @@
 sleep 3
 dvsource-file -l /home/dvswitch/loopdc10f.dv &
 xterm -e "dc-start-sink file:scratchy" &
-xterm -e "while true ; do dc-start-sink icecast:todd ; done" &
+xterm -e "while true ; do ssh todd 'ps fax | grep ffmpeg2theora| grep interschool| grep -v grep | sed -e "s/^ *//" |cut -d " " -f1 | | xargs -n 1 kill -9'  ; dc-start-sink icecast:todd ; done" &
 
 # last command
 xfce4-session

Modified: fai-config/scripts/DEBCONF10/60-fstab
===================================================================
--- fai-config/scripts/DEBCONF10/60-fstab	2010-08-03 05:10:20 UTC (rev 622)
+++ fai-config/scripts/DEBCONF10/60-fstab	2010-08-03 15:47:50 UTC (rev 623)
@@ -13,11 +13,11 @@
 	${target}/video mode=0775 owner=1000 group=1008
 
 editfiles:
-#  ENCODING::
+  ENCODING::
+	{ ${target}/etc/fstab
+	AppendIfNoSuchLine "barney:/video    /video      nfs     defaults,auto,ro 0       0"
+ 	}  
+#   DVSWITCH::
 #	{ ${target}/etc/fstab
 #	AppendIfNoSuchLine "barney:/video    /video      nfs     defaults,auto,ro 0       0"
-# 	}  
-   DVSWITCH::
-	{ ${target}/etc/fstab
-	AppendIfNoSuchLine "barney:/video    /video      nfs     defaults,auto,ro 0       0"
- 	}    
+#	}