diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-10-03 14:55:13 (GMT) |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-10-03 14:57:25 (GMT) |
| commit | 571ea34ff6c8c9f3896b519f4a0276d69898924d (patch) | |
| tree | 7842370e315611de0a7cb7e526539502e01fa773 | |
| parent | c32fef1406287ed324b1223837e7e7a539b86866 (diff) | |
| download | gdm-571ea34ff6.zip gdm-571ea34ff6.tar.xz | |
slave: remove initial-setup trigger file when finished
gnome-initial-setup knows whether or not to run by looking
for the existence of a trigger filed called
/var/lib/gdm/run-initial-setup
This commit ensures that file gets cleaned up after the initial setup
process completes.
| -rw-r--r-- | daemon/gdm-simple-slave.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index b0c5e5f..2e0b68b 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -65,6 +65,7 @@ #define DEFAULT_PING_INTERVAL 15 #define INITIAL_SETUP_USERNAME "gnome-initial-setup" +#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup" struct GdmSimpleSlavePrivate { @@ -1209,6 +1210,10 @@ destroy_initial_setup_user (GdmSimpleSlave *slave) } g_object_unref (user); } + + if (g_remove (INITIAL_SETUP_TRIGGER_FILE) < 0) { + g_warning ("Failed to remove '%s': %s", INITIAL_SETUP_TRIGGER_FILE, g_strerror (errno)); + } } static void @@ -1229,8 +1234,6 @@ wants_autologin (GdmSimpleSlave *slave) return enabled && delay == 0; } -#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup" - static gboolean wants_initial_setup (GdmSimpleSlave *slave) { |