chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework config file load logic
[elogind.git]
/
load-fragment.c
diff --git
a/load-fragment.c
b/load-fragment.c
index 2757506aba0d309f39fc737d2ea0b3fd30ba98da..9273fc8b83dceed7f71b8d99d47e2e8ca7b737c7 100644
(file)
--- a/
load-fragment.c
+++ b/
load-fragment.c
@@
-824,7
+824,7
@@
finish:
}
int unit_load_fragment(Unit *u) {
}
int unit_load_fragment(Unit *u) {
- int r =
-ENOENT
;
+ int r =
0
;
ExecContext *c;
assert(u);
ExecContext *c;
assert(u);
@@
-851,14
+851,16
@@
int unit_load_fragment(Unit *u) {
if (r >= 0 && c &&
(c->output == EXEC_KERNEL || c->output == EXEC_SYSLOG)) {
if (r >= 0 && c &&
(c->output == EXEC_KERNEL || c->output == EXEC_SYSLOG)) {
+ int k;
+
/* If syslog or kernel logging is requested, make sure
* our own logging daemon is run first. */
/* If syslog or kernel logging is requested, make sure
* our own logging daemon is run first. */
- if ((
r
= unit_add_dependency(u, UNIT_AFTER, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0)
- return
r
;
+ if ((
k
= unit_add_dependency(u, UNIT_AFTER, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0)
+ return
k
;
- if ((
r
= unit_add_dependency(u, UNIT_REQUIRES, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0)
- return
r
;
+ if ((
k
= unit_add_dependency(u, UNIT_REQUIRES, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0)
+ return
k
;
}
return r;
}
return r;