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:
6342c8e
)
service: add dependencies on configured sockets
author
Lennart Poettering
<lennart@poettering.net>
Fri, 6 Jan 2012 18:23:03 +0000
(19:23 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 6 Jan 2012 18:23:03 +0000
(19:23 +0100)
src/service.c
patch
|
blob
|
history
diff --git
a/src/service.c
b/src/service.c
index b97114c4be2de6aacaaf04a9a63e463a1283f4d6..c5a796623f18708daaae8f63d248f20144d2b8a4 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-1108,6
+1108,22
@@
static int service_add_default_dependencies(Service *s) {
return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
+static int service_add_socket_dependencies(Service *s) {
+ Iterator i;
+ Unit *u;
+ int r;
+
+ /* Make sure we pull in all explicitly configured sockets */
+
+ SET_FOREACH(u, s->configured_sockets, i) {
+ r = unit_add_two_dependencies(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, u, true);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
static void service_fix_output(Service *s) {
assert(s);
static void service_fix_output(Service *s) {
assert(s);
@@
-1181,6
+1197,12
@@
static int service_load(Unit *u) {
if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true)) < 0)
return r;
+ if (!set_isempty(s->configured_sockets)) {
+ r = service_add_socket_dependencies(s);
+ if (r < 0)
+ return r;
+ }
+
if (s->meta.default_dependencies)
if ((r = service_add_default_dependencies(s)) < 0)
return r;
if (s->meta.default_dependencies)
if ((r = service_add_default_dependencies(s)) < 0)
return r;