unit: make ignoring in snapshots a per unit property, instead of a per unit type...

[elogind.git] / src / snapshot.c

diff --git a/src/snapshot.c b/src/snapshot.c
index 7cde25d4f6a57c82b5f6645aece95289a0e2b83d..9825f90521d7ff7079200da066d88d5b863a24ed 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);


@@ -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,