Permalink
Browse files

Sync values and order of configs in src/cdm and src/cdmrc.

  • Loading branch information...
1 parent 8b79303 commit 1e1b7c5fa1840039b7d41eeb07eabadac1e8a9bf @CasperVector CasperVector committed Apr 8, 2012
Showing with 7 additions and 6 deletions.
  1. +5 −4 src/cdm
  2. +2 −2 src/cdmrc
View
9 src/cdm
@@ -58,16 +58,17 @@ fi
# Default options.
-dialogrc=${dialogrc:-}
-countfrom=${countfrom:-0}
binlist=${binlist:-()}
namelist=${namelist:-()}
+flaglist=${flaglist:-()}
+dialogrc=${dialogrc:-}
+countfrom=${countfrom:-0}
+display=${display:-0}
xtty=${xtty:-7}
+serverargs=${serverargs:-'-nolisten tcp'}
locktty=${locktty:-no}
-display=${display:-0}
consolekit=${consolekit:-yes}
cktimeout=${cktimeout:-30}
-serverargs=${serverargs:-'-nolisten tcp'}
# Offer all available sessions in /etc/X11/Sessions,
# if binlist if not explicitly set in cdmrc.
View
4 src/cdmrc
@@ -46,11 +46,11 @@ xtty=7
serverargs='-nolisten tcp'
# Should cdm(1) stick to the specified display?
-locktty=yes
+locktty=no
# Use consolekit for X session?
consolekit=yes
# Timeout for waiting for X session to register with consolekit.
-cktimeout=5
+cktimeout=30

0 comments on commit 1e1b7c5

Please sign in to comment.