summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-26 18:59:46 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-26 19:03:54 +0200
commit76e665855edef5b7103cb09d114377d477bfae02 (patch)
tree4141612e4ff03505d41ac1fc8e69e8709334c579 /src/machine
parente21fea24ae2a7a04f6d5c9d2bbbaf5833d248952 (diff)
logind: update the session state file before we send out the CreateSession() reply
https://bugs.freedesktop.org/show_bug.cgi?id=67273
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/machine-dbus.c4
-rw-r--r--src/machine/machined-dbus.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 6e1b8f8186..ceab96e078 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -350,6 +350,10 @@ int machine_send_create_reply(Machine *m, DBusError *error) {
return log_oom();
}
+ /* Update the machine state file before we notify the client
+ * about the result. */
+ machine_save(m);
+
if (!dbus_connection_send(m->manager->bus, reply, NULL))
return log_oom();
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 6c4d50b3a2..5a016e76bc 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -551,9 +551,8 @@ DBusHandlerResult bus_message_filter(
dbus_set_error(&error, BUS_ERROR_JOB_FAILED, "Start job for unit %s failed with '%s'", unit, result);
machine_send_create_reply(mm, &error);
}
- }
-
- machine_save(mm);
+ } else
+ machine_save(mm);
}
machine_add_to_gc_queue(mm);