diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-07-26 18:59:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-07-26 19:03:54 +0200 |
| commit | 76e665855edef5b7103cb09d114377d477bfae02 (patch) | |
| tree | 4141612e4ff03505d41ac1fc8e69e8709334c579 | |
| parent | e21fea24ae2a7a04f6d5c9d2bbbaf5833d248952 (diff) | |
logind: update the session state file before we send out the CreateSession() reply
https://bugs.freedesktop.org/show_bug.cgi?id=67273
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/login/logind-dbus.c | 5 | ||||
| -rw-r--r-- | src/login/logind-session-dbus.c | 4 | ||||
| -rw-r--r-- | src/machine/machine-dbus.c | 4 | ||||
| -rw-r--r-- | src/machine/machined-dbus.c | 5 |
5 files changed, 12 insertions, 8 deletions
@@ -51,8 +51,6 @@ CGroup Rework Completion: Features: -* remove systemctl load-unit - * journalctl: instead --after-cursor= maybe have a --cursor=XYZ+1 syntax? * given that logind/machined now let PID 1 do all nasty work we can diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index b5e975a9f7..7b9bd201b2 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2368,9 +2368,8 @@ DBusHandlerResult bus_message_filter( dbus_set_error(&error, BUS_ERROR_JOB_FAILED, "Start job for unit %s failed with '%s'", unit, result); session_send_create_reply(s, &error); } - } - - session_save(s); + } else + 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 210f7564da..2cc4d8587b 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -592,6 +592,10 @@ int session_send_create_reply(Session *s, DBusError *error) { return log_oom(); } + /* Update the state file before we notify the client about the + * result */ + session_save(s); + if (!dbus_connection_send(s->manager->bus, reply, NULL)) return log_oom(); 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); |