service: save/restore status text string

[elogind.git] / src / snapshot.c

diff --git a/src/snapshot.c b/src/snapshot.c
index ba72edc255dcad1bbe9b754d7a71791889ec6b0f..e1583384cd8baac11fa0fe5713158ffdbf32a7bf 100644 (file)
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -25,6 +25,7 @@
 #include "snapshot.h"
 #include "unit-name.h"
 #include "dbus-snapshot.h"
+#include "bus-errors.h"
 
 static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
         [SNAPSHOT_DEAD] = UNIT_INACTIVE,
@@ -55,7 +56,7 @@ static int snapshot_load(Unit *u) {
 
         /* Make sure that only snapshots created via snapshot_create()
          * can be loaded */
-        if (!s->by_snapshot_create)
+        if (!s->by_snapshot_create && s->meta.manager->n_deserializing <= 0)
                 return -ENOENT;
 
         u->meta.load_state = UNIT_LOADED;
@@ -174,7 +175,7 @@ static const char *snapshot_sub_state_to_string(Unit *u) {
         return snapshot_state_to_string(SNAPSHOT(u)->state);
 }
 
-int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
+int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Snapshot **_s) {
         Iterator i;
         Unit *other, *u = NULL;
         char *n = NULL;
@@ -185,14 +186,20 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
         assert(_s);
 
         if (name) {
-                if (!unit_name_is_valid(name))
+                if (!unit_name_is_valid(name)) {
+                        dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
                         return -EINVAL;
+                }
 
-                if (unit_name_to_type(name) != UNIT_SNAPSHOT)
+                if (unit_name_to_type(name) != UNIT_SNAPSHOT) {
+                        dbus_set_error(e, BUS_ERROR_UNIT_TYPE_MISMATCH, "Unit name %s lacks snapshot suffix.", name);
                         return -EINVAL;
+                }
 
-                if (manager_get_unit(m, name))
+                if (manager_get_unit(m, name)) {
+                        dbus_set_error(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name);
                         return -EEXIST;
+                }
 
         } else {
 
@@ -209,7 +216,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
                 name = n;
         }
 
-        r = manager_load_unit_prepare(m, name, NULL, &u);
+        r = manager_load_unit_prepare(m, name, NULL, e, &u);
         free(n);
 
         if (r < 0)