From 87e3ce54e42a4ed8a7b9286a84531f277eee80e2 Mon Sep 17 00:00:00 2001
From: Ben Pence <github@benpence.com>
Date: Sat, 2 Aug 2014 10:45:16 -0400
Subject: [PATCH] Updates cdm's call to startx to be compatible with Xorg 1.16.

In the Xorg 1.16 notes at:

  https://www.archlinux.org/news/xorg-server-116-is-now-available/

it mentions that X "must be launched from the same virtual terminal as was used
to log in"; therefore, cdm now launches, by default, on the same VT.

"...redirecting stderr also breaks rootless login"; therefore, cdm no longer
saves stderr. All the Xorg output should be available in is already available in
logs:

  ~/.local/share/xorg/
---
 src/cdm-xlaunch | 4 ++--
 src/cdmrc       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cdm-xlaunch b/src/cdm-xlaunch
index 8c4882f..02cca0a 100755
--- a/src/cdm-xlaunch
+++ b/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),
diff --git a/src/cdmrc b/src/cdmrc
index 01aecb6..c3c24c3 100644
--- a/src/cdmrc
+++ b/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