manager: include full systemctl status command line in error message

[elogind.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 9c817b0e416c30b8d9c5e7264bdb66da8187c67a..62451a0d9ea4b3a11e08ee9144e368c7abbf1a56 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -1468,9 +1468,10 @@ static int transaction_add_job_and_dependencies(
         if (type != JOB_STOP && unit->meta.load_state == UNIT_ERROR) {
                 dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
                                "Unit %s failed to load: %s. "
-                               "See system logs and 'systemctl status' for details.",
+                               "See system logs and 'systemctl status %s' for details.",
                                unit->meta.id,
-                               strerror(-unit->meta.load_error));
+                               strerror(-unit->meta.load_error),
+                               unit->meta.id);
                 return -EINVAL;
         }
 
@@ -2688,6 +2689,10 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds) {
         if (ferror(f))
                 return -EIO;
 
+        r = bus_fdset_add_all(m, fds);
+        if (r < 0)
+                return r;
+
         return 0;
 }
 
@@ -2841,7 +2846,7 @@ int manager_reload(Manager *m) {
                 r = q;
 
         assert(m->n_deserializing > 0);
-        m->n_deserializing ++;
+        m->n_deserializing--;
 
 finish:
         if (f)