chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: check for unneeded dependencies even when unit stop was expected
[elogind.git]
/
src
/
snapshot.c
diff --git
a/src/snapshot.c
b/src/snapshot.c
index 7cde25d4f6a57c82b5f6645aece95289a0e2b83d..270dc4f2525f005b1c308ca40e5ac67904a03f0c 100644
(file)
--- a/
src/snapshot.c
+++ b/
src/snapshot.c
@@
-32,6
+32,16
@@
static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
[SNAPSHOT_ACTIVE] = UNIT_ACTIVE
};
[SNAPSHOT_ACTIVE] = UNIT_ACTIVE
};
+static void snapshot_init(Unit *u) {
+ Snapshot *s = SNAPSHOT(u);
+
+ assert(s);
+ assert(s->meta.load_state == UNIT_STUB);
+
+ s->meta.ignore_on_isolate = true;
+ s->meta.ignore_on_snapshot = true;
+}
+
static void snapshot_set_state(Snapshot *s, SnapshotState state) {
SnapshotState old_state;
assert(s);
static void snapshot_set_state(Snapshot *s, SnapshotState state) {
SnapshotState old_state;
assert(s);
@@
-56,7
+66,7
@@
static int snapshot_load(Unit *u) {
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
- if (!s->by_snapshot_create && s->meta.manager->n_
deserializ
ing <= 0)
+ if (!s->by_snapshot_create && s->meta.manager->n_
reload
ing <= 0)
return -ENOENT;
u->meta.load_state = UNIT_LOADED;
return -ENOENT;
u->meta.load_state = UNIT_LOADED;
@@
-228,7
+238,7
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
- if (
UNIT_VTABLE(other)->no_snapshots
)
+ if (
other->meta.ignore_on_snapshot
)
continue;
if (k != other->meta.id)
continue;
if (k != other->meta.id)
@@
-275,9
+285,10
@@
const UnitVTable snapshot_vtable = {
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,
- .no_snapshots = true,
.no_gc = true,
.no_gc = true,
+ .init = snapshot_init,
+
.load = snapshot_load,
.coldplug = snapshot_coldplug,
.load = snapshot_load,
.coldplug = snapshot_coldplug,