logind: update the session state file before we send out the CreateSession() reply

https://bugs.freedesktop.org/show_bug.cgi?id=67273

diff --git a/TODO b/TODO
index 35ce46ff404a6a2ac9c776620a1b71cdaf4e6296..57ff3311c9ae09bf97138b7dda929f0d144fe115 100644 (file)
--- a/TODO
+++ b/TODO
@@ -51,8 +51,6 @@ CGroup Rework Completion:
 
 Features:
 
 
 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
 * 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 b5e975a9f79966f659b7997540fdc26311a43202..7b9bd201b24c9902cc357202e53377c2bd138f09 100644 (file)
--- 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);
                                                 }
                                                         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);
                                 }
 
                                 session_add_to_gc_queue(s);

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 210f7564da86d1771017232b88951eb5497aa896..2cc4d8587bff6452f6fee64142deea0efcdbe6b9 100644 (file)
--- 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();
         }
 
                         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();
 
         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 6e1b8f8186050311c354a4ca5304bd1340be06dd..ceab96e07832d375e3ae801f5dd98002a9edd8a5 100644 (file)
--- 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();
         }
 
                         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();
 
         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 6c4d50b3a2274fdcb961320ea04d16835ed84712..5a016e76bc1c3518ffc18f955a8dd74ec85ad104 100644 (file)
--- 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);
                                         }
                                                 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);
                         }
 
                         machine_add_to_gc_queue(mm);