systemctl: cache tty value before we open the pager

[elogind.git] / src / snapshot.c

diff --git a/src/snapshot.c b/src/snapshot.c
index f58d46e91702aedfa0c04920131576da6580edea..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
 };
 
+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);
@@ -45,7 +55,7 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) {
                           snapshot_state_to_string(old_state),
                           snapshot_state_to_string(state));
 
-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
+        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
 }
 
 static int snapshot_load(Unit *u) {
@@ -56,7 +66,7 @@ static int snapshot_load(Unit *u) {
 
         /* Make sure that only snapshots created via snapshot_create()
          * can be loaded */
-        if (!s->by_snapshot_create && s->meta.manager->n_deserializing <= 0)
+        if (!s->by_snapshot_create && s->meta.manager->n_reloading <= 0)
                 return -ENOENT;
 
         u->meta.load_state = UNIT_LOADED;
@@ -186,7 +196,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
         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;
                 }
@@ -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) {
 
-                if (UNIT_VTABLE(other)->no_snapshots)
+                if (other->meta.ignore_on_snapshot)
                         continue;
 
                 if (k != other->meta.id)
@@ -275,9 +285,10 @@ const UnitVTable snapshot_vtable = {
 
         .no_alias = true,
         .no_instances = true,
-        .no_snapshots = true,
         .no_gc = true,
 
+        .init = snapshot_init,
+
         .load = snapshot_load,
         .coldplug = snapshot_coldplug,