chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: use SCM_SECURITY to race-freely determine peer SELinux label
[elogind.git]
/
src
/
snapshot.c
diff --git
a/src/snapshot.c
b/src/snapshot.c
index f58d46e91702aedfa0c04920131576da6580edea..82ec5104dbfa07bd81085e32fefd8ae950864783 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(UNIT(s)->load_state == UNIT_STUB);
+
+ UNIT(s)->ignore_on_isolate = true;
+ UNIT(s)->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);
@@
-41,25
+51,25
@@
static void snapshot_set_state(Snapshot *s, SnapshotState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
s->meta.
id,
+
UNIT(s)->
id,
snapshot_state_to_string(old_state),
snapshot_state_to_string(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) {
Snapshot *s = SNAPSHOT(u);
assert(u);
}
static int snapshot_load(Unit *u) {
Snapshot *s = SNAPSHOT(u);
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
/* 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 &&
UNIT(s)->manager->n_reload
ing <= 0)
return -ENOENT;
return -ENOENT;
- u->
meta.
load_state = UNIT_LOADED;
+ u->load_state = UNIT_LOADED;
return 0;
}
return 0;
}
@@
-123,8
+133,8
@@
static int snapshot_serialize(Unit *u, FILE *f, FDSet *fds) {
unit_serialize_item(u, f, "state", snapshot_state_to_string(s->state));
unit_serialize_item(u, f, "cleanup", yes_no(s->cleanup));
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_WANTS], i)
- unit_serialize_item(u, f, "wants", other->
meta.
id);
+ SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
+ unit_serialize_item(u, f, "wants", other->id);
return 0;
}
return 0;
}
@@
-186,7
+196,7
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
assert(_s);
if (name) {
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;
}
dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
return -EINVAL;
}
@@
-224,14
+234,14
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
SNAPSHOT(u)->by_snapshot_create = true;
manager_dispatch_load_queue(m);
SNAPSHOT(u)->by_snapshot_create = true;
manager_dispatch_load_queue(m);
- assert(u->
meta.
load_state == UNIT_LOADED);
+ assert(u->load_state == UNIT_LOADED);
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
HASHMAP_FOREACH_KEY(other, k, m->units, i) {
- if (
UNIT_VTABLE(other)->no_snapshots
)
+ if (
other->ignore_on_snapshot
)
continue;
continue;
- if (k != other->
meta.
id)
+ if (k != other->id)
continue;
if (UNIT_VTABLE(other)->check_snapshot)
continue;
if (UNIT_VTABLE(other)->check_snapshot)
@@
-272,12
+282,14
@@
DEFINE_STRING_TABLE_LOOKUP(snapshot_state, SnapshotState);
const UnitVTable snapshot_vtable = {
.suffix = ".snapshot",
const UnitVTable snapshot_vtable = {
.suffix = ".snapshot",
+ .object_size = sizeof(Snapshot),
.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,