|
 |
6547aba |
From f2069f4f9cd2e4e8ebf91eed65ea12c2e4055acd Mon Sep 17 00:00:00 2001
|
|
|
6547aba |
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
|
6547aba |
Date: Thu, 18 Jan 2018 16:40:30 +0100
|
|
|
6547aba |
Subject: [PATCH 1/2] x-server-local: Set background to none if not set
|
|
|
6547aba |
|
|
|
6547aba |
---
|
|
|
6547aba |
src/x-server-local.c | 6 ++++--
|
|
|
6547aba |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
6547aba |
|
|
|
6547aba |
diff --git a/src/x-server-local.c b/src/x-server-local.c
|
|
|
6547aba |
index 80e0ab0d..bb09a329 100644
|
|
|
6547aba |
--- a/src/x-server-local.c
|
|
|
6547aba |
+++ b/src/x-server-local.c
|
|
|
6547aba |
@@ -481,8 +481,10 @@ x_server_local_start (DisplayServer *display_server)
|
|
|
6547aba |
if (server->priv->vt >= 0)
|
|
|
6547aba |
g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
|
|
|
6547aba |
|
|
|
6547aba |
- if (server->priv->background)
|
|
|
6547aba |
- g_string_append_printf (command, " -background %s", server->priv->background);
|
|
|
6547aba |
+ if (!server->priv->background)
|
|
|
6547aba |
+ x_server_local_set_background (server, "none");
|
|
|
6547aba |
+
|
|
|
6547aba |
+ g_string_append_printf (command, " -background %s", server->priv->background);
|
|
|
6547aba |
|
|
|
6547aba |
/* Allow sub-classes to add arguments */
|
|
|
6547aba |
if (X_SERVER_LOCAL_GET_CLASS (server)->add_args)
|
|
|
6547aba |
|
|
|
6547aba |
From 49ddf36823438bac09f55fec3cdc4fc7288a0d96 Mon Sep 17 00:00:00 2001
|
|
|
6547aba |
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
|
6547aba |
Date: Thu, 18 Jan 2018 16:42:37 +0100
|
|
|
6547aba |
Subject: [PATCH 2/2] seat-local: Return active VT if Plymouth gets deactivated
|
|
|
6547aba |
|
|
|
6547aba |
---
|
|
|
6547aba |
src/seat-local.c | 2 ++
|
|
|
6547aba |
1 file changed, 2 insertions(+)
|
|
|
6547aba |
|
|
|
6547aba |
diff --git a/src/seat-local.c b/src/seat-local.c
|
|
|
6547aba |
index 9d83ca97..a5d313eb 100644
|
|
|
6547aba |
--- a/src/seat-local.c
|
|
|
6547aba |
+++ b/src/seat-local.c
|
|
|
6547aba |
@@ -158,6 +158,8 @@ get_vt (SeatLocal *seat, DisplayServer *display_server)
|
|
|
6547aba |
g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat);
|
|
|
6547aba |
g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_transition_plymouth_cb), seat);
|
|
|
6547aba |
plymouth_deactivate ();
|
|
|
6547aba |
+
|
|
|
6547aba |
+ return vt;
|
|
|
6547aba |
}
|
|
|
6547aba |
else
|
|
|
6547aba |
l_debug (seat, "Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
|