[Debconf-video-commits] r638 - in fai-config: class files/etc/motd

[Holger Levsen]

Author: holger
Date: 2011-07-15 13:31:20 +0000 (Fri, 15 Jul 2011)
New Revision: 638

Added:
   fai-config/class/20-debconf11-classes
   fai-config/class/DEBCONF11.var
Removed:
   fai-config/class/20-debconf10-classes
   fai-config/class/DEBCONF10.var
Modified:
   fai-config/files/etc/motd/DEBCONF10
Log:
s#debconf10#debconf11#

Deleted: fai-config/class/20-debconf10-classes
===================================================================
--- fai-config/class/20-debconf10-classes	2011-07-15 08:18:27 UTC (rev 637)
+++ fai-config/class/20-debconf10-classes	2011-07-15 13:31:20 UTC (rev 638)
@@ -1,58 +0,0 @@
-#! /bin/bash
-
-# assign classes for hosts at debconf10
-# `hostname -f` doesnt return proper results (before running fai :)
-
-#
-# the class DEBCONF10 is reserved for machines at the venue...
-#
-
-case $HOSTNAME in
-   selma|patty|jackie|sideshow|itchy|scratchy|blinky|barney|lisa|ned|rod|todd|dolph|jimbo|kearney)
-		echo "FAIBASE DEBCONF DEBCONF10 VIDEO" ;;
-esac
-
-#case $HOSTNAME in
-#   dolph)	echo "IPW2X00"
-#esac
-
-case $HOSTNAME in
-   patty|itchy|jackie|blinky|sideshow) 
-   		echo "CAPTURE";;
-   selma|scratchy) 
-   		echo "XORG CAPTURE DVSWITCH STORAGE";;
-   ned|todd) 
-   		echo "ENCODING";;
-   dolph|jimbo|kearney)
-   		echo "XORG REVIEW";;
-   lisa)
-   		echo "ICECAST";;
-   barney|rod)
-   		echo "STORAGE ENCODING";;
-esac
-
-case $HOSTNAME in
-   selma|scratchy) 
-   		echo "NVIDIA";;
-   barney) 
-   		echo "PENTA";;
-esac
-
-
-#case $HOSTNAME in
-#   selma) 
-#   		echo "BRIDGE";;
-#esac
-
-case $HOSTNAME in 
-   selma|patty|jackie|sideshow|itchy|scratchy|blinky|ned|rod|todd|barney)
-   		echo "DVSWITCHPUBKEY";;
-esac
-
-# post-processing after debconf9 at home, do not define DEBCONF8 here
-#case $HOSTNAME in
-#   io)
-#		echo "FAIBASE DEBCONF VIDEO ENCODING STORAGE" ;;
-#esac
-
-

Copied: fai-config/class/20-debconf11-classes (from rev 629, fai-config/class/20-debconf10-classes)
===================================================================
--- fai-config/class/20-debconf11-classes	                        (rev 0)
+++ fai-config/class/20-debconf11-classes	2011-07-15 13:31:20 UTC (rev 638)
@@ -0,0 +1,58 @@
+#! /bin/bash
+
+# assign classes for hosts at debconf11
+# `hostname -f` doesnt return proper results (before running fai :)
+
+#
+# the class DEBCONF11 is reserved for machines at the venue...
+#
+
+case $HOSTNAME in
+   selma|patty|jackie|sideshow|itchy|scratchy|blinky|barney|lisa|ned|rod|todd|dolph|jimbo|kearney)
+		echo "FAIBASE DEBCONF DEBCONF11 VIDEO" ;;
+esac
+
+#case $HOSTNAME in
+#   dolph)	echo "IPW2X00"
+#esac
+
+case $HOSTNAME in
+   patty|itchy|jackie|blinky|sideshow) 
+   		echo "CAPTURE";;
+   selma|scratchy) 
+   		echo "XORG CAPTURE DVSWITCH STORAGE";;
+   ned|todd) 
+   		echo "ENCODING";;
+   dolph|jimbo|kearney)
+   		echo "XORG REVIEW";;
+   lisa)
+   		echo "ICECAST";;
+   barney|rod)
+   		echo "STORAGE ENCODING";;
+esac
+
+case $HOSTNAME in
+   selma|scratchy) 
+   		echo "NVIDIA";;
+   barney) 
+   		echo "PENTA";;
+esac
+
+
+#case $HOSTNAME in
+#   selma) 
+#   		echo "BRIDGE";;
+#esac
+
+case $HOSTNAME in 
+   selma|patty|jackie|sideshow|itchy|scratchy|blinky|ned|rod|todd|barney)
+   		echo "DVSWITCHPUBKEY";;
+esac
+
+# post-processing after debconf9 at home, do not define DEBCONF8 here
+#case $HOSTNAME in
+#   io)
+#		echo "FAIBASE DEBCONF VIDEO ENCODING STORAGE" ;;
+#esac
+
+

Deleted: fai-config/class/DEBCONF10.var
===================================================================
--- fai-config/class/DEBCONF10.var	2011-07-15 08:18:27 UTC (rev 637)
+++ fai-config/class/DEBCONF10.var	2011-07-15 13:31:20 UTC (rev 638)
@@ -1,13 +0,0 @@
-UTC=no
-time_zone=America/New_York
-FAI_ACTION=softupdate
-EVENT=dc10
-
-hosterrorpatterns="XXXXX"
-hostignorepatterns="$hostignorepatterns
-dmesg.log:.*Error: Driver .pcspkr. is already registered, aborting...
-dmesg.log:.* warning.*ntpd.*uses 32-bit capabilities.*
-dmesg.log:.* AER service couldn't init device .* - no _OSC support
-dmesg.log:.* pnp 00:09: can't add resource for IO 0x4d0-0x4d1
-dmesg.log:.* ACPI Warning (tbutils-0217): Incorrect checksum in table [OEMB] - 09, should be FE [20080321]"
-

Copied: fai-config/class/DEBCONF11.var (from rev 604, fai-config/class/DEBCONF10.var)
===================================================================
--- fai-config/class/DEBCONF11.var	                        (rev 0)
+++ fai-config/class/DEBCONF11.var	2011-07-15 13:31:20 UTC (rev 638)
@@ -0,0 +1,13 @@
+UTC=no
+time_zone=Europe/Sarajevo
+FAI_ACTION=softupdate
+EVENT=dc11
+
+hosterrorpatterns="XXXXX"
+hostignorepatterns="$hostignorepatterns
+dmesg.log:.*Error: Driver .pcspkr. is already registered, aborting...
+dmesg.log:.* warning.*ntpd.*uses 32-bit capabilities.*
+dmesg.log:.* AER service couldn't init device .* - no _OSC support
+dmesg.log:.* pnp 00:09: can't add resource for IO 0x4d0-0x4d1
+dmesg.log:.* ACPI Warning (tbutils-0217): Incorrect checksum in table [OEMB] - 09, should be FE [20080321]"
+

Modified: fai-config/files/etc/motd/DEBCONF10
===================================================================
--- fai-config/files/etc/motd/DEBCONF10	2011-07-15 08:18:27 UTC (rev 637)
+++ fai-config/files/etc/motd/DEBCONF10	2011-07-15 13:31:20 UTC (rev 638)
@@ -1,9 +1,9 @@
 Plan your installation, and FAI installs your plan.
 
 
-       .''`.           DebConf10 video team machine
+       .''`.           DebConf11 video team machine
       : :`  :  
-      `. `'`           New York City, USA
+      `. `'`           Banja Luka, Bosnia and Herzegovina
         `-  
 
 --