summaryrefslogtreecommitdiffstats
path: root/debian/patches/94_retain_xorg_log.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/94_retain_xorg_log.patch')
-rw-r--r--debian/patches/94_retain_xorg_log.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/94_retain_xorg_log.patch b/debian/patches/94_retain_xorg_log.patch
new file mode 100644
index 0000000..bf1a6a2
--- /dev/null
+++ b/debian/patches/94_retain_xorg_log.patch
@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 8 Nov 2014 18:10:47 +0100
+Subject: reinstate Xorg.N.log at Xorg maintainers' request
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771
+Forwarded: no
+Origin: vendor, Debian
+---
+ daemon/gdm-server.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
+index e5d2352..c4d487d 100644
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -235,12 +235,14 @@ gdm_server_init_command (GdmServer *server)
+ * missing, or c) we are running for the main seat 'seat0'. */
+
+ #ifdef ENABLE_SYSTEMD_JOURNAL
+- /* For systemd, we don't have a log file but instead log to stdout,
+- so set it to the xserver's built-in default verbosity */
++ /* For systemd, we log to stdout (which is the Journal),
++ so set it to the same verbosity we use for -logverbose.
++ In Debian we want to log to Xorg.N.log in addition,
++ so we do not turn that off like GNOME upstream do. */
+ if (debug)
+- verbosity = "7 -logfile /dev/null";
++ verbosity = "7";
+ else
+- verbosity = "3 -logfile /dev/null";
++ verbosity = "3";
+ #endif
+
+ if (g_access (SYSTEMD_X_SERVER, X_OK) < 0) {