picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: update state file after generating the session fifo, not before

Browse source 
https://bugs.freedesktop.org/show_bug.cgi?id=67273
This commit is contained in:
Lennart Poettering 2013-07-26 17:32:19 +02:00
parent fd587c876d
commit cba38758b4
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/login/logind-dbus.c
View file

@ -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);

4
src/login/logind-session-dbus.c
View file

@ -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;

3
src/machine/machined-dbus.c
View file

@ -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);