Package: kde-workspace / 4:4.11.13-2

kdm_X_path.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Subject: Fallback to default X location (Debian specific)
Forwarded: not-needed
Last-Update: 2011-08-29
Index: kde-workspace/kdm/backend/dm.c
===================================================================
--- kde-workspace.orig/kdm/backend/dm.c	2014-07-31 18:05:25.926140713 +0200
+++ kde-workspace/kdm/backend/dm.c	2014-07-31 18:05:25.922140876 +0200
@@ -640,7 +640,13 @@
             exit(1);
         debug("exec %\"[s\n", argv);
         (void)execv(argv[0], argv);
-        logError("X server %\"s cannot be executed\n", argv[0]);
+
+        /* Let's try again with a standard path */
+        argv[0] = "/usr/bin/X";
+        debug( "exec %\"[s\n", argv );
+        (void)execv( argv[0], argv );
+
+        logError( "X server %\"s cannot be executed\n", argv[0] );
         exit(1);
     case -1:
         logError("Forking X server for remote login failed: %m");
Index: kde-workspace/kdm/backend/server.c
===================================================================
--- kde-workspace.orig/kdm/backend/server.c	2014-07-31 18:05:25.926140713 +0200
+++ kde-workspace/kdm/backend/server.c	2014-07-31 18:05:25.922140876 +0200
@@ -97,6 +97,12 @@
          */
         (void)Signal(SIGUSR1, SIG_IGN);
         (void)execv(argv[0], argv);
+
+        /* Let's try again with a standard path */
+        argv[0] = "/usr/bin/X";
+        debug( "exec %\"[s\n", argv );
+        (void)execv( argv[0], argv );
+
         logError("X server %\"s cannot be executed\n", argv[0]);
         exit(47);
     case -1: