[Debconf-video-commits] r593 - in fai-config: files/etc files/etc/default files/etc/default/nodm package_config scripts/DVSWITCH

[Holger Levsen]

Author: holger
Date: 2010-07-31 18:29:30 +0000 (Sat, 31 Jul 2010)
New Revision: 593

Added:
   fai-config/files/etc/default/
   fai-config/files/etc/default/nodm/
   fai-config/files/etc/default/nodm/DVSWITCH
Removed:
   fai-config/files/etc/kde3/
Modified:
   fai-config/package_config/VIDEO
   fai-config/scripts/DVSWITCH/20-dvswitchrc
Log:
switch to nodm for DVSWITCH

Added: fai-config/files/etc/default/nodm/DVSWITCH
===================================================================
--- fai-config/files/etc/default/nodm/DVSWITCH	                        (rev 0)
+++ fai-config/files/etc/default/nodm/DVSWITCH	2010-07-31 18:29:30 UTC (rev 593)
@@ -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=dvswitch
+
+# 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/package_config/VIDEO
===================================================================
--- fai-config/package_config/VIDEO	2010-07-31 17:37:08 UTC (rev 592)
+++ fai-config/package_config/VIDEO	2010-07-31 18:29:30 UTC (rev 593)
@@ -16,11 +16,11 @@
 irssi xchat
 
 PACKAGES install DVSWITCH
-dvswitch
+dvswitch nodm
 debconf-video-switch
 
 PACKAGES remove DVSWITCH
-xscreensaver
+xscreensaver kdm
 
 PACKAGES install REVIEW
 totem mplayer xine-ui vlc

Modified: fai-config/scripts/DVSWITCH/20-dvswitchrc
===================================================================
--- fai-config/scripts/DVSWITCH/20-dvswitchrc	2010-07-31 17:37:08 UTC (rev 592)
+++ fai-config/scripts/DVSWITCH/20-dvswitchrc	2010-07-31 18:29:30 UTC (rev 593)
@@ -12,3 +12,4 @@
 
 cp /usr/share/doc/debconf-video-common/conf/$EVENT/dvswitchrc-$HOSTNAME /etc/dvswitchrc
 
+fcopy -M /etc/default/nodm