[Debconf-video-commits] r453 - in fai-config: class doc/src files/etc/hosts files/etc/network/interfaces files/home/dvswitch/.Xsession
Holger Levsen
holger at alioth.debian.org
Wed Jul 8 09:18:46 UTC 2009
Author: holger
Date: 2009-07-08 09:18:45 +0000 (Wed, 08 Jul 2009)
New Revision: 453
Added:
fai-config/files/home/dvswitch/.Xsession/REVIEW
Removed:
fai-config/files/etc/network/interfaces/donald
fai-config/files/etc/network/interfaces/hashbaz
fai-config/files/etc/network/interfaces/mickey
fai-config/files/etc/network/interfaces/mrwhite
fai-config/files/etc/network/interfaces/shadow
fai-config/files/home/dvswitch/.Xsession/mrwhite
Modified:
fai-config/class/20-debconf9-classes
fai-config/class/29-fosdem2009-classes
fai-config/doc/src/create_usbstick_howto.txt
fai-config/files/etc/hosts/FOSDEM
fai-config/files/home/dvswitch/.Xsession/scratchy
fai-config/files/home/dvswitch/.Xsession/selma
Log:
do the renaming dance here too
Modified: fai-config/class/20-debconf9-classes
===================================================================
--- fai-config/class/20-debconf9-classes 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/class/20-debconf9-classes 2009-07-08 09:18:45 UTC (rev 453)
@@ -8,42 +8,36 @@
#
case $HOSTNAME in
- selma|patty|itchy|scratchy|daffy|barney|mrwhite|lisa|marge)
+ selma|patty|itchy|scratchy|barney|lisa|ned|rod|todd|dolph|jimbo|kearney|nelson)
echo "FAIBASE DEBCONF DEBCONF9 VIDEO" ;;
esac
case $HOSTNAME in
patty) echo "IPW2X00"
-
-case $HOSTNAME in
- selma|scratchy|mrwhite)
- echo "XORG";;
esac
case $HOSTNAME in
- daffy)
- echo "ENCODING";;
- marge|patty|itchy|scratchy)
+ patty|itchy)
echo "CAPTURE";;
- mrwhite)
- echo "REVIEW";;
+ selma|scratchy)
+ echo "XORG CAPTURE DVSWITCH";;
+ ned|rod|todd)
+ echo "ENCODING";;
+ dolph|jimbo|kearney|nelson)
+ echo "XORG REVIEW";;
lisa)
echo "ICECAST";;
barney)
echo "STORAGE";;
esac
-case $HOSTNAME in
- selma|scratchy)
- echo "DVSWITCH";;
-esac
#case $HOSTNAME in
# selma)
# echo "BRIDGE";;
#esac
case $HOSTNAME in
- selma|patty|itchy|scratchy|marge|daffy|barney)
+ selma|patty|itchy|scratchy|ned|rod|todd|barney)
echo "DVSWITCHPUBKEY";;
esac
Modified: fai-config/class/29-fosdem2009-classes
===================================================================
--- fai-config/class/29-fosdem2009-classes 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/class/29-fosdem2009-classes 2009-07-08 09:18:45 UTC (rev 453)
@@ -7,7 +7,7 @@
#
case $HOSTNAME in
- selma|patty|daffy)
+ selma|patty|ned)
echo "FAIBASE DEBCONF VIDEO FOSDEM" ;;
esac
@@ -17,11 +17,11 @@
esac
case $HOSTNAME in
- daffy)
+ ned)
echo "ENCODING";;
- selma|patty|daffy)
+ selma|patty|ned)
echo "CAPTURE";;
- daffy)
+ ned)
echo "ICECAST";;
selma)
echo "STORAGE";;
@@ -33,7 +33,7 @@
esac
case $HOSTNAME in
- selma|patty|daffy)
+ selma|patty|ned)
echo "DVSWITCHPUBKEY";;
esac
Modified: fai-config/doc/src/create_usbstick_howto.txt
===================================================================
--- fai-config/doc/src/create_usbstick_howto.txt 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/doc/src/create_usbstick_howto.txt 2009-07-08 09:18:45 UTC (rev 453)
@@ -38,12 +38,8 @@
The installation is automatic, the root password will be set to "fai". You just
-have to confirm partitioning and choose a hostname from the following list:
+have to confirm partitioning and choose the right hostname.
-h01ger's: patty
-DaCa's: daffy
-Q_'s selma
-
That should be all ;)
After the installation is done, check /etc/motd and /etc/hosts if they look
Modified: fai-config/files/etc/hosts/FOSDEM
===================================================================
--- fai-config/files/etc/hosts/FOSDEM 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/hosts/FOSDEM 2009-07-08 09:18:45 UTC (rev 453)
@@ -4,7 +4,7 @@
192.168.0.254 linksys.debconf.org linksys
192.168.0.1 patty.debconf.org patty
192.168.0.2 selma.debconf.org selma
-192.168.0.3 daffy.debconf.org daffy
+192.168.0.3 ned.debconf.org ned
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback
Deleted: fai-config/files/etc/network/interfaces/donald
===================================================================
--- fai-config/files/etc/network/interfaces/donald 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/network/interfaces/donald 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,14 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet static
- address 10.9.0.10
- netmask 255.255.0.0
- gateway 10.9.0.1
- broadcast 10.9.255.255
-
Deleted: fai-config/files/etc/network/interfaces/hashbaz
===================================================================
--- fai-config/files/etc/network/interfaces/hashbaz 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/network/interfaces/hashbaz 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,14 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto eth1
-iface eth1 inet static
- address 10.9.0.7
- netmask 255.255.0.0
- gateway 10.9.0.1
- broadcast 10.9.255.255
-
Deleted: fai-config/files/etc/network/interfaces/mickey
===================================================================
--- fai-config/files/etc/network/interfaces/mickey 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/network/interfaces/mickey 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,14 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet static
- address 10.9.0.9
- netmask 255.255.0.0
- gateway 10.9.0.1
- broadcast 10.9.255.255
-
Deleted: fai-config/files/etc/network/interfaces/mrwhite
===================================================================
--- fai-config/files/etc/network/interfaces/mrwhite 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/network/interfaces/mrwhite 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,17 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-#auto br0
-#iface br0 inet static
-# bridge_ports eth1 eth2
-auto eth1
-iface eth1 inet static
- address 10.9.0.8
- netmask 255.255.0.0
- gateway 10.9.0.1
- broadcast 10.9.255.255
-
Deleted: fai-config/files/etc/network/interfaces/shadow
===================================================================
--- fai-config/files/etc/network/interfaces/shadow 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/etc/network/interfaces/shadow 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,14 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet static
- address 10.9.0.12
- netmask 255.255.0.0
- gateway 10.9.0.1
- broadcast 10.9.255.255
-
Copied: fai-config/files/home/dvswitch/.Xsession/REVIEW (from rev 448, fai-config/files/home/dvswitch/.Xsession/mrwhite)
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/REVIEW (rev 0)
+++ fai-config/files/home/dvswitch/.Xsession/REVIEW 2009-07-08 09:18:45 UTC (rev 453)
@@ -0,0 +1,7 @@
+# run vlc on login
+vlc "http://video.debconf.org:8000/Microcine.ogv.m3u" &
+vlc "http://video.debconf.org:8000/Salon_del_mar.ogv.m3u"&
+
+# last command
+xfce4-session
+
Property changes on: fai-config/files/home/dvswitch/.Xsession/REVIEW
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: fai-config/files/home/dvswitch/.Xsession/mrwhite
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/mrwhite 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/home/dvswitch/.Xsession/mrwhite 2009-07-08 09:18:45 UTC (rev 453)
@@ -1,7 +0,0 @@
-# run vlc on login
-vlc "http://video.debconf.org:8000/Microcine.ogv.m3u" &
-vlc "http://video.debconf.org:8000/Salon_del_mar.ogv.m3u"&
-
-# last command
-icewm-session
-
Modified: fai-config/files/home/dvswitch/.Xsession/scratchy
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/scratchy 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/home/dvswitch/.Xsession/scratchy 2009-07-08 09:18:45 UTC (rev 453)
@@ -22,5 +22,5 @@
xterm -e "dc-start-sink icecast:daffy" &
# last command
-icewm-session
+xfce4-session
Modified: fai-config/files/home/dvswitch/.Xsession/selma
===================================================================
--- fai-config/files/home/dvswitch/.Xsession/selma 2009-07-08 09:04:18 UTC (rev 452)
+++ fai-config/files/home/dvswitch/.Xsession/selma 2009-07-08 09:18:45 UTC (rev 453)
@@ -17,5 +17,5 @@
xterm -e "dc-start-sink icecast:daffy" &
# last command
-icewm-session
+xfce4-session
More information about the Debconf-video-commits
mailing list