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 (from parent 1:
0404c60
)
core: sysvcompat - avoid repeated function call
author
Tom Gundersen
<teg@jklm.no>
Wed, 14 May 2014 20:03:14 +0000
(22:03 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 14 May 2014 20:03:14 +0000
(22:03 +0200)
src/core/service.c
patch
|
blob
|
history
diff --git
a/src/core/service.c
b/src/core/service.c
index 4b6220e34d9532fc3688a3f8a14f7fa383cb90bb..172233013e153d7871d82b5d6cfbe36a797d159e 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-834,6
+834,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) {
char *n, *m;
FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) {
char *n, *m;
+ bool is_before;
if (!(n = strndup(w, z))) {
r = -ENOMEM;
if (!(n = strndup(w, z))) {
r = -ENOMEM;
@@
-854,11
+855,13
@@
static int service_load_sysv_path(Service *s, const char *path) {
if (r == 0)
continue;
if (r == 0)
continue;
- if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !startswith_no_case(t, "X-Start-Before:"))
+ is_before = startswith_no_case(t, "X-Start-Before:");
+
+ if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before)
/* the network-online target is special, as it needs to be actively pulled in */
r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, m, NULL, true);
else
/* the network-online target is special, as it needs to be actively pulled in */
r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_WANTS, m, NULL, true);
else
- r = unit_add_dependency_by_name(u,
startswith_no_case(t, "X-Start-Before:")
? UNIT_BEFORE : UNIT_AFTER, m, NULL, true);
+ r = unit_add_dependency_by_name(u,
is_before
? UNIT_BEFORE : UNIT_AFTER, m, NULL, true);
if (r < 0)
log_error_unit(u->id, "[%s:%u] Failed to add dependency on %s, ignoring: %s",
if (r < 0)
log_error_unit(u->id, "[%s:%u] Failed to add dependency on %s, ignoring: %s",