From f2069f4f9cd2e4e8ebf91eed65ea12c2e4055acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 18 Jan 2018 16:40:30 +0100
Subject: [PATCH 1/2] x-server-local: Set background to none if not set

---
 src/x-server-local.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/x-server-local.c b/src/x-server-local.c
index 80e0ab0d..bb09a329 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -481,8 +481,10 @@ x_server_local_start (DisplayServer *display_server)
     if (server->priv->vt >= 0)
         g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
 
-    if (server->priv->background)
-        g_string_append_printf (command, " -background %s", server->priv->background);
+    if (!server->priv->background)
+        x_server_local_set_background (server, "none");
+
+    g_string_append_printf (command, " -background %s", server->priv->background);
 
     /* Allow sub-classes to add arguments */
     if (X_SERVER_LOCAL_GET_CLASS (server)->add_args)

From 49ddf36823438bac09f55fec3cdc4fc7288a0d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 18 Jan 2018 16:42:37 +0100
Subject: [PATCH 2/2] seat-local: Return active VT if Plymouth gets deactivated

---
 src/seat-local.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/seat-local.c b/src/seat-local.c
index 9d83ca97..a5d313eb 100644
--- a/src/seat-local.c
+++ b/src/seat-local.c
@@ -158,6 +158,8 @@ get_vt (SeatLocal *seat, DisplayServer *display_server)
             g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat);
             g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_transition_plymouth_cb), seat);
             plymouth_deactivate ();
+
+            return vt;
         }
         else
             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 ());