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:
ebfaa15
)
execute: when running in session mode, still enforce proper ordering of logger socket
author
Lennart Poettering
<lennart@poettering.net>
Wed, 31 Mar 2010 14:27:19 +0000
(16:27 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 31 Mar 2010 14:27:19 +0000
(16:27 +0200)
load-fragment.c
patch
|
blob
|
history
diff --git
a/load-fragment.c
b/load-fragment.c
index 1e98004c39d1aac3eecb0773a3e83265b157cba5..0b43c81194c7931f25565cbe976618ffd1002860 100644
(file)
--- a/
load-fragment.c
+++ b/
load-fragment.c
@@
-1253,8
+1253,7
@@
int unit_load_fragment(Unit *u) {
c = NULL;
if (c &&
c = NULL;
if (c &&
- (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG) &&
- u->meta.manager->running_as != MANAGER_SESSION) {
+ (c->output == EXEC_OUTPUT_KERNEL || c->output == EXEC_OUTPUT_SYSLOG)) {
int k;
/* If syslog or kernel logging is requested, make sure
int k;
/* If syslog or kernel logging is requested, make sure
@@
-1263,8
+1262,9
@@
int unit_load_fragment(Unit *u) {
if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0)
return k;
if ((k = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET)) < 0)
return k;
- if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0)
- return k;
+ if (u->meta.manager->running_as != MANAGER_SESSION)
+ if ((k = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET)) < 0)
+ return k;
}
}
}
}