[Debconf-video-commits] r786 - in fai-config: files/etc/default/nodm files/etc/hosts files/etc/network/interfaces scripts scripts/DEBCONF12 scripts/REVIEW
Holger Levsen
holger at alioth.debian.org
Tue Jul 10 23:43:24 UTC 2012
Author: holger
Date: 2012-07-10 23:43:24 +0000 (Tue, 10 Jul 2012)
New Revision: 786
Added:
fai-config/files/etc/default/nodm/REVIEW
fai-config/files/etc/network/interfaces/review1
fai-config/files/etc/network/interfaces/review2
fai-config/scripts/REVIEW/
fai-config/scripts/REVIEW/10-adduser-review
fai-config/scripts/REVIEW/20-nodm
Removed:
fai-config/files/etc/hosts/review1
fai-config/files/etc/hosts/review2
Modified:
fai-config/files/etc/hosts/DEBCONF12
fai-config/scripts/DEBCONF12/60-fstab
Log:
review station configuration
Copied: fai-config/files/etc/default/nodm/REVIEW (from rev 755, fai-config/files/etc/default/nodm/DVSWITCH)
===================================================================
--- fai-config/files/etc/default/nodm/REVIEW (rev 0)
+++ fai-config/files/etc/default/nodm/REVIEW 2012-07-10 23:43:24 UTC (rev 786)
@@ -0,0 +1,23 @@
+# nodm configuration
+
+# Set NODM_ENABLED to something different than 'false' to enable nodm
+NODM_ENABLED=true
+
+# User to autologin for
+NODM_USER=review
+
+# xinit program
+NODM_XINIT=/usr/bin/xinit
+
+# First vt to try when looking for free VTs
+NODM_FIRST_VT=7
+
+# X session
+NODM_XSESSION=/etc/X11/Xsession
+
+# Options for the X server
+NODM_X_OPTIONS='vt7 -nolisten tcp'
+
+# If an X session will run for less than this time in seconds, nodm will wait an
+# increasing bit of time before restarting the session.
+NODM_MIN_SESSION_TIME=60
Modified: fai-config/files/etc/hosts/DEBCONF12
===================================================================
--- fai-config/files/etc/hosts/DEBCONF12 2012-07-10 20:02:15 UTC (rev 785)
+++ fai-config/files/etc/hosts/DEBCONF12 2012-07-10 23:43:24 UTC (rev 786)
@@ -16,13 +16,16 @@
172.31.1.0 r1gw.dc12.debconf.org r1gw
172.31.1.1 r1dvswitch.dc12.debconf.org r1dvswitch
172.31.1.2 r1grab1.dc12.debconf.org r1grab1 encoder1.dc12.debconf.org encoder1
+172.31.1.3 r1grab2.dc12.debconf.org r1grab2
-172.31.1.3 r1grab2.dc12.debconf.org r1grab2
172.31.2.0 r2gw.dc12.debconf.org r2gw
172.31.2.1 r2dvswitch.dc12.debconf.org r2dvswitch
172.31.2.2 r2grab1.dc12.debconf.org r2grab1 encoder2.dc12.debconf.org encoder2
172.31.2.3 r2grab2.dc12.debconf.org r2grab2
+
172.31.11.1 storage1.dc12.debconf.org storage1
172.31.12.1 localstream1.dc12.debconf.org localstream1
+172.30.3.1 review2.dc12.debconf.org review1
+172.30.3.2 review2.dc12.debconf.org review1
Deleted: fai-config/files/etc/hosts/review1
===================================================================
--- fai-config/files/etc/hosts/review1 2012-07-10 20:02:15 UTC (rev 785)
+++ fai-config/files/etc/hosts/review1 2012-07-10 23:43:24 UTC (rev 786)
@@ -1,28 +0,0 @@
-127.0.0.1 localhost review1.dc12.debconf.org
-
-82.195.75.74 apu.debconf.org apu
-72.14.176.206 krusty.debconf.org krusty
-
-89.16.166.49 db.debconf.org db
-
-# The following lines are desirable for IPv6 capable hosts
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-172.31.1.0 r1gw.dc12.debconf.org r1gw
-172.31.1.1 r1dvswitch.dc12.debconf.org r1dvswitch
-172.31.1.2 r1grab1.dc12.debconf.org r1grab1 encoder1.dc12.debconf.org encoder1
-
-172.31.1.3 r1grab2.dc12.debconf.org r1grab2
-172.31.2.0 r2gw.dc12.debconf.org r2gw
-172.31.2.1 r2dvswitch.dc12.debconf.org r2dvswitch
-172.31.2.2 r2grab1.dc12.debconf.org r2grab1 encoder2.dc12.debconf.org encoder2
-172.31.2.3 r2grab2.dc12.debconf.org r2grab2
-172.31.11.1 storage1.dc12.debconf.org storage1
-172.31.12.1 localstream1.dc12.debconf.org localstream1
-
-
Deleted: fai-config/files/etc/hosts/review2
===================================================================
--- fai-config/files/etc/hosts/review2 2012-07-10 20:02:15 UTC (rev 785)
+++ fai-config/files/etc/hosts/review2 2012-07-10 23:43:24 UTC (rev 786)
@@ -1,28 +0,0 @@
-127.0.0.1 localhost review2.dc12.debconf.org
-
-82.195.75.74 apu.debconf.org apu
-72.14.176.206 krusty.debconf.org krusty
-
-89.16.166.49 db.debconf.org db
-
-# The following lines are desirable for IPv6 capable hosts
-::1 ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-172.31.1.0 r1gw.dc12.debconf.org r1gw
-172.31.1.1 r1dvswitch.dc12.debconf.org r1dvswitch
-172.31.1.2 r1grab1.dc12.debconf.org r1grab1 encoder1.dc12.debconf.org encoder1
-
-172.31.1.3 r1grab2.dc12.debconf.org r1grab2
-172.31.2.0 r2gw.dc12.debconf.org r2gw
-172.31.2.1 r2dvswitch.dc12.debconf.org r2dvswitch
-172.31.2.2 r2grab1.dc12.debconf.org r2grab1 encoder2.dc12.debconf.org encoder2
-172.31.2.3 r2grab2.dc12.debconf.org r2grab2
-172.31.11.1 storage1.dc12.debconf.org storage1
-172.31.12.1 localstream1.dc12.debconf.org localstream1
-
-
Added: fai-config/files/etc/network/interfaces/review1
===================================================================
--- fai-config/files/etc/network/interfaces/review1 (rev 0)
+++ fai-config/files/etc/network/interfaces/review1 2012-07-10 23:43:24 UTC (rev 786)
@@ -0,0 +1,9 @@
+# generated by FAI
+auto lo eth0
+iface lo inet loopback
+iface eth0 inet static
+ address 172.30.3.1
+ netmask 255.255.0.0
+ broadcast 172.30.255.255
+ gateway 172.30.15.1
+
Added: fai-config/files/etc/network/interfaces/review2
===================================================================
--- fai-config/files/etc/network/interfaces/review2 (rev 0)
+++ fai-config/files/etc/network/interfaces/review2 2012-07-10 23:43:24 UTC (rev 786)
@@ -0,0 +1,9 @@
+# generated by FAI
+auto lo eth0
+iface lo inet loopback
+iface eth0 inet static
+ address 172.30.3.2
+ netmask 255.255.0.0
+ broadcast 172.30.255.255
+ gateway 172.30.15.1
+
Modified: fai-config/scripts/DEBCONF12/60-fstab
===================================================================
--- fai-config/scripts/DEBCONF12/60-fstab 2012-07-10 20:02:15 UTC (rev 785)
+++ fai-config/scripts/DEBCONF12/60-fstab 2012-07-10 23:43:24 UTC (rev 786)
@@ -15,8 +15,12 @@
editfiles:
ENCODING::
{ ${target}/etc/fstab
- AppendIfNoSuchLine "barney:/video /video nfs defaults,auto,ro 0 0"
+ AppendIfNoSuchLine "storage1:/video /video nfs defaults,auto,rw 0 0"
}
+ REVIEW::
+ { ${target}/etc/fstab
+ AppendIfNoSuchLine "storage1:/video /video nfs defaults,auto,ro 0 0"
+ }
# goldberg is also storage server
goldberg::
{ ${target}/etc/fstab
Added: fai-config/scripts/REVIEW/10-adduser-review
===================================================================
--- fai-config/scripts/REVIEW/10-adduser-review (rev 0)
+++ fai-config/scripts/REVIEW/10-adduser-review 2012-07-10 23:43:24 UTC (rev 786)
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+#
+# (c) 2006-2012 Holger Levsen holger at layer-acht.org
+# GPL2 licenced
+#
+
+USER=review
+$ROOTCMD adduser --quiet --disabled-password --gecos "" $USER
+
+
+# the videoteam group which owns the raw1394 device etc
+for i in dialout cdrom floppy audio video plugdev powerdev nvram netdev ; do $ROOTCMD adduser --quiet $USER $i ; done
+
Property changes on: fai-config/scripts/REVIEW/10-adduser-review
___________________________________________________________________
Added: svn:executable
+ *
Copied: fai-config/scripts/REVIEW/20-nodm (from rev 755, fai-config/scripts/VIDEO/10-debconf-video)
===================================================================
--- fai-config/scripts/REVIEW/20-nodm (rev 0)
+++ fai-config/scripts/REVIEW/20-nodm 2012-07-10 23:43:24 UTC (rev 786)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# (c) 2012 Holger Levsen holger at layer-acht.org
+# GPL2 licenced
+#
+fcopy -M /etc/default/nodm
More information about the Debconf-video-commits
mailing list