[Debconf-video-commits] r302 - in fai-config: class scripts/DVSWITCH scripts/VIDEO

[holger at alioth.debian.org]

Author: holger
Date: 2009-02-06 13:48:22 +0000 (Fri, 06 Feb 2009)
New Revision: 302

Added:
   fai-config/class/FOSDEM.var
Modified:
   fai-config/scripts/DVSWITCH/20-dvswitchrc
   fai-config/scripts/VIDEO/10-debconf-video
Log:
refactor the code to deploy the right configs from the debconf-video package

Added: fai-config/class/FOSDEM.var
===================================================================
--- fai-config/class/FOSDEM.var	                        (rev 0)
+++ fai-config/class/FOSDEM.var	2009-02-06 13:48:22 UTC (rev 302)
@@ -0,0 +1,4 @@
+UTC=no
+FAI_ACTION=softupdate
+# this is used to pick the right configs from the debconf-video package
+EVENT=fosdem09

Modified: fai-config/scripts/DVSWITCH/20-dvswitchrc
===================================================================
--- fai-config/scripts/DVSWITCH/20-dvswitchrc	2009-02-06 11:56:49 UTC (rev 301)
+++ fai-config/scripts/DVSWITCH/20-dvswitchrc	2009-02-06 13:48:22 UTC (rev 302)
@@ -7,8 +7,8 @@
 
 HOSTNAME=`hostname`
 
-# TODO: this is DEBCONF8 specific
-[ -f /usr/share/doc/debconf-video-common/conf/dc8/dvswitchrc-$HOSTNAME ] || exit 0
+# $EVENT  is definied in class/*var
+[ -f /usr/share/doc/debconf-video-common/conf/$EVENT/dvswitchrc-$HOSTNAME ] || exit 0
 
-cp /usr/share/doc/debconf-video-common/conf/dc8/dvswitchrc-$HOSTNAME /etc/dvswitchrc
+cp /usr/share/doc/debconf-video-common/conf/$EVENT/dvswitchrc-$HOSTNAME /etc/dvswitchrc
 

Modified: fai-config/scripts/VIDEO/10-debconf-video
===================================================================
--- fai-config/scripts/VIDEO/10-debconf-video	2009-02-06 11:56:49 UTC (rev 301)
+++ fai-config/scripts/VIDEO/10-debconf-video	2009-02-06 13:48:22 UTC (rev 302)
@@ -7,12 +7,12 @@
 
 HOSTNAME=`hostname`
 
-# TODO: this is DEBCONF8 specific
-[ -f /usr/share/doc/debconf-video-common/conf/dc8/default-$HOSTNAME ] || exit 0
+# $EVENT  is definied in class/*var
+[ -f /usr/share/doc/debconf-video-common/conf/$EVENT/default-$HOSTNAME ] || exit 0
 
 source /etc/default/debconf-video.passwd || exit 1
 
-cp /usr/share/doc/debconf-video-common/conf/dc8/default-$HOSTNAME /etc/default/debconf-video 
+cp /usr/share/doc/debconf-video-common/conf/$EVENT/default-$HOSTNAME /etc/default/debconf-video 
 
 # #HOSTNAME# gets replaced by $HOSTNAME and so on...
 sed -i "s/#ICECAST_PASS#/$ICECAST_PASS/" /etc/default/debconf-video