diff options
| author | Ray Strode <rstrode@redhat.com> | 2018-08-31 15:52:07 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2018-08-31 17:05:53 -0400 |
| commit | 365c58c0f4e4488496283005c5f800c27ad15d7c (patch) | |
| tree | 6c18d742f6ee00de5b6a4239e736d7b1dbd1511c | |
| parent | c274ef84f51ed8a33d9ce286d6fd594e5808b315 (diff) | |
| download | gdm-365c58c0f4e4488496283005c5f800c27ad15d7c.tar.gz | |
launch-environment: use wayland for initial-setup
While we've been using wayland by default for the login screen
for a long time, and for the user session for somewhat less time,
we never switched initial setup over.
It's still using X11 for no good reason.
This commit changes initial-setup to use wayland by default like
everything else.
| -rw-r--r-- | daemon/gdm-launch-environment.c | 3 | ||||
| -rw-r--r-- | daemon/gdm-launch-environment.h | 1 | ||||
| -rw-r--r-- | daemon/gdm-legacy-display.c | 7 | ||||
| -rw-r--r-- | daemon/gdm-local-display.c | 12 |
4 files changed, 11 insertions, 12 deletions
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c index 897ddf46..788f3a1e 100644 --- a/daemon/gdm-launch-environment.c +++ b/daemon/gdm-launch-environment.c @@ -978,6 +978,7 @@ gdm_create_greeter_launch_environment (const char *display_name, GdmLaunchEnvironment * gdm_create_initial_setup_launch_environment (const char *display_name, const char *seat_id, + const char *session_type, const char *display_hostname, gboolean display_is_local) { @@ -985,7 +986,7 @@ gdm_create_initial_setup_launch_environment (const char *display_name, INITIAL_SETUP_USERNAME, display_name, seat_id, - NULL, + session_type, INITIAL_SETUP_SESSION_MODE, display_hostname, display_is_local); diff --git a/daemon/gdm-launch-environment.h b/daemon/gdm-launch-environment.h index c2a09d1c..00ac2a0d 100644 --- a/daemon/gdm-launch-environment.h +++ b/daemon/gdm-launch-environment.h @@ -77,6 +77,7 @@ GdmLaunchEnvironment *gdm_create_greeter_launch_environment (const char *display gboolean display_is_local); GdmLaunchEnvironment *gdm_create_initial_setup_launch_environment (const char *display_name, const char *seat_id, + const char *session_type, const char *display_hostname, gboolean display_is_local); GdmLaunchEnvironment *gdm_create_chooser_launch_environment (const char *display_name, diff --git a/daemon/gdm-legacy-display.c b/daemon/gdm-legacy-display.c index cd6259ba..0dd8c734 100644 --- a/daemon/gdm-legacy-display.c +++ b/daemon/gdm-legacy-display.c @@ -115,9 +115,10 @@ gdm_legacy_display_prepare (GdmDisplay *display) TRUE); } else { launch_environment = gdm_create_initial_setup_launch_environment (display_name, - seat_id, - NULL, - TRUE); + seat_id, + NULL, + NULL, + TRUE); } g_object_set (self, "launch-environment", launch_environment, NULL); diff --git a/daemon/gdm-local-display.c b/daemon/gdm-local-display.c index b1ed2bc8..3b682262 100644 --- a/daemon/gdm-local-display.c +++ b/daemon/gdm-local-display.c @@ -110,11 +110,6 @@ gdm_local_display_prepare (GdmDisplay *display) } g_debug ("doing initial setup? %s", doing_initial_setup? "yes" : "no"); - if (doing_initial_setup && g_strcmp0 (session_type, "wayland") == 0) { - g_debug ("initial setup doesn't have a wayland session, failing back to X11"); - failed = TRUE; - goto out; - } if (!doing_initial_setup) { launch_environment = gdm_create_greeter_launch_environment (NULL, @@ -124,9 +119,10 @@ gdm_local_display_prepare (GdmDisplay *display) TRUE); } else { launch_environment = gdm_create_initial_setup_launch_environment (NULL, - seat_id, - NULL, - TRUE); + seat_id, + session_type, + NULL, + TRUE); } g_object_set (self, "launch-environment", launch_environment, NULL); |