shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

execute: when running in session mode, still enforce proper ordering of logger socket

Browse Source
This commit is contained in:
Lennart Poettering 2010-03-31 16:27:19 +02:00
parent ebfaa1586e
commit c9dae904f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
load-fragment.c
View File

@ -1253,8 +1253,7 @@ int unit_load_fragment(Unit *u) {
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
@ -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_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;
}
}