diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-10-23 15:03:42 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-10-24 15:36:20 -0400 |
| commit | c793c5ba0a249025ddb1d6d2aa24575c88a32751 (patch) | |
| tree | 0ee12e641272e689fb07ad29d830ab3038094219 | |
| parent | 4e409d6626737f0e668d86dd233ed105fd2f44fa (diff) | |
| download | gdm-c793c5ba0a249025ddb1d6d2aa24575c88a32751.tar.gz | |
display: don't mark initial-setup ran until it ran
We don't want to skip running initial setup if wayland
fell back or something.
This commit makes sure we only stop trying to start initial-setup
after it's completed.
https://bugzilla.gnome.org/show_bug.cgi?id=789434
| -rw-r--r-- | daemon/gdm-display.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index 1f1ecb6d..6a3984a9 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -1465,16 +1465,6 @@ already_done_initial_setup_on_this_boot (void) if (g_file_test (ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT, G_FILE_TEST_EXISTS)) return TRUE; - if (!g_file_set_contents (ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT, - "1", - 1, - &error)) { - g_warning ("GdmDisplay: Could not write initial-setup-done marker to %s: %s", - ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT, - error->message); - g_clear_error (&error); - } - return FALSE; } @@ -1719,6 +1709,8 @@ out: void gdm_display_stop_greeter_session (GdmDisplay *self) { + GError *error = NULL; + if (self->priv->launch_environment != NULL) { g_signal_handlers_disconnect_by_func (self->priv->launch_environment, @@ -1742,6 +1734,16 @@ gdm_display_stop_greeter_session (GdmDisplay *self) if (self->priv->doing_initial_setup) { chown_initial_setup_home_dir (); + + if (!g_file_set_contents (ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT, + "1", + 1, + &error)) { + g_warning ("GdmDisplay: Could not write initial-setup-done marker to %s: %s", + ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT, + error->message); + g_clear_error (&error); + } } } |