|
 |
e0b6b0 |
From 763e31a576a4cd665e5ad06ad0eb4610cecc0b42 Mon Sep 17 00:00:00 2001
|
|
|
c90517 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
c90517 |
Date: Fri, 10 Jul 2020 10:45:52 -0400
|
|
|
e0b6b0 |
Subject: [PATCH 46/51] gdm-x-session: tell x server to not vt switch
|
|
|
c90517 |
|
|
|
c90517 |
gdm already handles the VT switching on X's behalf,
|
|
|
c90517 |
so it's redundant, and X does it at inopportune times,
|
|
|
c90517 |
so instruct it to not get involved.
|
|
|
c90517 |
---
|
|
|
c90517 |
daemon/gdm-x-session.c | 1 +
|
|
|
c90517 |
1 file changed, 1 insertion(+)
|
|
|
c90517 |
|
|
|
c90517 |
diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
|
|
|
c90517 |
index 3b2fcef47..d8e3c7d53 100644
|
|
|
c90517 |
--- a/daemon/gdm-x-session.c
|
|
|
c90517 |
+++ b/daemon/gdm-x-session.c
|
|
|
c90517 |
@@ -247,60 +247,61 @@ spawn_x_server (State *state,
|
|
|
c90517 |
}
|
|
|
c90517 |
|
|
|
c90517 |
g_ptr_array_add (arguments, "-displayfd");
|
|
|
c90517 |
g_ptr_array_add (arguments, display_fd_string);
|
|
|
c90517 |
|
|
|
c90517 |
g_ptr_array_add (arguments, "-auth");
|
|
|
c90517 |
g_ptr_array_add (arguments, auth_file);
|
|
|
c90517 |
|
|
|
c90517 |
/* If we were compiled with Xserver >= 1.17 we need to specify
|
|
|
c90517 |
* '-listen tcp' as the X server dosen't listen on tcp sockets
|
|
|
c90517 |
* by default anymore. In older versions we need to pass
|
|
|
c90517 |
* -nolisten tcp to disable listening on tcp sockets.
|
|
|
c90517 |
*/
|
|
|
c90517 |
#ifdef HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY
|
|
|
c90517 |
if (allow_remote_connections) {
|
|
|
c90517 |
g_ptr_array_add (arguments, "-listen");
|
|
|
c90517 |
g_ptr_array_add (arguments, "tcp");
|
|
|
c90517 |
}
|
|
|
c90517 |
#else
|
|
|
c90517 |
if (!allow_remote_connections) {
|
|
|
c90517 |
g_ptr_array_add (arguments, "-nolisten");
|
|
|
c90517 |
g_ptr_array_add (arguments, "tcp");
|
|
|
c90517 |
}
|
|
|
c90517 |
#endif
|
|
|
c90517 |
|
|
|
c90517 |
g_ptr_array_add (arguments, "-background");
|
|
|
c90517 |
g_ptr_array_add (arguments, "none");
|
|
|
c90517 |
|
|
|
c90517 |
g_ptr_array_add (arguments, "-noreset");
|
|
|
c90517 |
g_ptr_array_add (arguments, "-keeptty");
|
|
|
c90517 |
+ g_ptr_array_add (arguments, "-novtswitch");
|
|
|
c90517 |
|
|
|
c90517 |
g_ptr_array_add (arguments, "-verbose");
|
|
|
c90517 |
if (state->debug_enabled) {
|
|
|
c90517 |
g_ptr_array_add (arguments, "7");
|
|
|
c90517 |
} else {
|
|
|
c90517 |
g_ptr_array_add (arguments, "3");
|
|
|
c90517 |
}
|
|
|
c90517 |
|
|
|
c90517 |
if (state->debug_enabled) {
|
|
|
c90517 |
g_ptr_array_add (arguments, "-core");
|
|
|
c90517 |
}
|
|
|
c90517 |
g_ptr_array_add (arguments, NULL);
|
|
|
c90517 |
|
|
|
c90517 |
subprocess = g_subprocess_launcher_spawnv (launcher,
|
|
|
c90517 |
(const char * const *) arguments->pdata,
|
|
|
c90517 |
&error);
|
|
|
c90517 |
g_free (display_fd_string);
|
|
|
c90517 |
g_clear_object (&launcher);
|
|
|
c90517 |
g_ptr_array_free (arguments, TRUE);
|
|
|
c90517 |
|
|
|
c90517 |
if (subprocess == NULL) {
|
|
|
c90517 |
g_debug ("could not start X server: %s", error->message);
|
|
|
c90517 |
goto out;
|
|
|
c90517 |
}
|
|
|
c90517 |
|
|
|
c90517 |
input_stream = g_unix_input_stream_new (pipe_fds[0], TRUE);
|
|
|
c90517 |
data_stream = g_data_input_stream_new (input_stream);
|
|
|
c90517 |
g_clear_object (&input_stream);
|
|
|
c90517 |
|
|
|
c90517 |
display_number = g_data_input_stream_read_line (data_stream,
|
|
|
c90517 |
--
|
|
|
e0b6b0 |
2.27.0
|
|
|
c90517 |
|