chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a40eb73
)
snapshot: downgrade automatic dependencies from Requires to Wants
author
Lennart Poettering
<lennart@poettering.net>
Sat, 3 Jul 2010 17:51:24 +0000
(19:51 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 3 Jul 2010 17:51:24 +0000
(19:51 +0200)
src/snapshot.c
patch
|
blob
|
history
diff --git
a/src/snapshot.c
b/src/snapshot.c
index 399aaea597a824a065f9e64a06033bd10cc8a8ff..ba72edc255dcad1bbe9b754d7a71791889ec6b0f 100644
(file)
--- a/
src/snapshot.c
+++ b/
src/snapshot.c
@@
-122,8
+122,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_
REQUIRE
S], i)
- unit_serialize_item(u, f, "
require
s", other->meta.id);
+ SET_FOREACH(other, u->meta.dependencies[UNIT_
WANT
S], i)
+ unit_serialize_item(u, f, "
want
s", other->meta.id);
return 0;
}
return 0;
}
@@
-152,12
+152,9
@@
static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
else
s->cleanup = r;
else
s->cleanup = r;
- } else if (streq(key, "
require
s")) {
+ } else if (streq(key, "
want
s")) {
- 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 r;
} else
log_debug("Unknown serialization key '%s'", key);
@@
-237,10
+234,7
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
continue;
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;
}
goto fail;
}