-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#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,
if (state != old_state)
log_debug("%s changed %s -> %s",
- UNIT(s)->meta.id,
+ s->meta.id,
snapshot_state_to_string(old_state),
snapshot_state_to_string(state));
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
}
+static int snapshot_load(Unit *u) {
+ Snapshot *s = SNAPSHOT(u);
+
+ assert(u);
+ assert(u->meta.load_state == UNIT_STUB);
+
+ /* Make sure that only snapshots created via snapshot_create()
+ * can be loaded */
+ if (!s->by_snapshot_create && s->meta.manager->n_deserializing <= 0)
+ return -ENOENT;
+
+ u->meta.load_state = UNIT_LOADED;
+ return 0;
+}
+
static int snapshot_coldplug(Unit *u) {
Snapshot *s = SNAPSHOT(u);
unit_serialize_item(u, f, "state", snapshot_state_to_string(s->state));
unit_serialize_item(u, f, "cleanup", yes_no(s->cleanup));
- SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
- unit_serialize_item(u, f, "requires", other->meta.id);
+ SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
+ unit_serialize_item(u, f, "wants", other->meta.id);
return 0;
}
else
s->cleanup = r;
- } else if (streq(key, "requires")) {
+ } else if (streq(key, "wants")) {
- if ((r = unit_add_dependency_by_name(u, UNIT_AFTER, value, NULL, true)) < 0)
- return r;
-
- if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, value, NULL, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, value, NULL, true)) < 0)
return r;
} else
log_debug("Unknown serialization key '%s'", key);
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;
assert(_s);
if (name) {
- if (!unit_name_is_valid(name))
+ if (!unit_name_is_valid(name, false)) {
+ 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 {
name = n;
}
- r = manager_load_unit(m, name, NULL, &u);
+ r = manager_load_unit_prepare(m, name, NULL, e, &u);
free(n);
if (r < 0)
goto fail;
+ SNAPSHOT(u)->by_snapshot_create = true;
+ manager_dispatch_load_queue(m);
+ assert(u->meta.load_state == UNIT_LOADED);
+
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
if (UNIT_VTABLE(other)->no_snapshots)
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
continue;
- if ((r = unit_add_dependency(u, UNIT_REQUIRES, other, true)) < 0)
- goto fail;
-
- if ((r = unit_add_dependency(u, UNIT_AFTER, other, true)) < 0)
+ if ((r = unit_add_two_dependencies(u, UNIT_AFTER, UNIT_WANTS, other, true)) < 0)
goto fail;
}
.no_snapshots = true,
.no_gc = true,
- .load = unit_load_nop,
+ .load = snapshot_load,
.coldplug = snapshot_coldplug,
.dump = snapshot_dump,
.active_state = snapshot_active_state,
.sub_state_to_string = snapshot_sub_state_to_string,
+ .bus_interface = "org.freedesktop.systemd1.Snapshot",
.bus_message_handler = bus_snapshot_message_handler
};