Merge 8458645387 into 719b4a5e91

src/cdm-xlaunch

@@ -87,9 +87,9 @@ fi
 
 if $altstartx; then
     # Alternative method of calling setsid(/startx) for systems that are unresponsive to the 'normal' call.
-    (setsid startx "$@" > "$startxlog" 2>&1 &)
+    (startx "$@" > "$startxlog")
 else
-    setsid startx "$@" > "$startxlog" 2>&1 &
+    startx "$@" > "$startxlog"
 fi
 
 # If wait(1) returns with a value >128, it was interrupted by kill(1),

src/cdmrc

@@ -41,7 +41,7 @@ display=0
 
 # Where should the first X tty be spawned?
 # special value `keep' causes to run X in current tty.
-xtty=7
+xtty=keep
 
 # Should cdm(1) stick to the specified display?
 locktty=no