diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-07-26 17:32:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-07-26 17:33:01 +0200 |
| commit | cba38758b4d49c6fe7c2f0eea255e11ee9df23eb (patch) | |
| tree | ce078091f357aebadb35bd3bba418482671752b1 | |
| parent | fd587c876d480863d56bbbdc5e9fcf7e735d98f3 (diff) | |
logind: update state file after generating the session fifo, not before
https://bugs.freedesktop.org/show_bug.cgi?id=67273
Notes
Backport: bugfix
| -rw-r--r-- | src/login/logind-dbus.c | 7 | ||||
| -rw-r--r-- | src/login/logind-session-dbus.c | 4 | ||||
| -rw-r--r-- | src/machine/machined-dbus.c | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 39af637d1..b5e975a9f 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -643,6 +643,10 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) { session->create_message = dbus_message_ref(message); + /* Now, let's wait until the slice unit and stuff got + * created. We send the reply back from + * session_send_create_reply().*/ + return 0; fail: @@ -2356,7 +2360,6 @@ DBusHandlerResult bus_message_filter( if (streq_ptr(path, s->scope_job)) { free(s->scope_job); s->scope_job = NULL; - session_save(s); if (s->started) { if (streq(result, "done")) @@ -2366,6 +2369,8 @@ DBusHandlerResult bus_message_filter( session_send_create_reply(s, &error); } } + + session_save(s); } session_add_to_gc_queue(s); diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c index 62b9ffd52..210f7564d 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -535,6 +535,10 @@ int session_send_create_reply(Session *s, DBusError *error) { if (!s->create_message) return 0; + /* This is called after the session scope was successfully + * created, and finishes where bus_manager_create_session() + * left off. */ + if (error) { DBusError buffer; diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 1e8bc609a..6c4d50b3a 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -543,7 +543,6 @@ DBusHandlerResult bus_message_filter( if (streq_ptr(path, mm->scope_job)) { free(mm->scope_job); mm->scope_job = NULL; - machine_save(mm); if (mm->started) { if (streq(result, "done")) @@ -553,6 +552,8 @@ DBusHandlerResult bus_message_filter( machine_send_create_reply(mm, &error); } } + + machine_save(mm); } machine_add_to_gc_queue(mm); |