diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-09-18 17:11:12 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-09-18 19:53:34 +0200 |
| commit | 67445f4e22ad924394acdd4fd49e6f238244a5ca (patch) | |
| tree | 2f493d45b15768cffcac5eb34c7afed0514f7344 /src/core/service.c | |
| parent | e872b43c7ee51efb6bd6ca31d79e02af8cc3cb82 (diff) | |
core: move ManagerRunningAs to shared
Note: I did s/MANAGER/SYSTEMD/ everywhere, even though it makes the
patch quite verbose. Nevertheless, keeping MANAGER prefix in some
places, and SYSTEMD prefix in others would just lead to confusion down
the road. Better to rip off the band-aid now.
Diffstat (limited to 'src/core/service.c')
| -rw-r--r-- | src/core/service.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/service.c b/src/core/service.c index 39e1ab5167..7c79dcdd14 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1192,12 +1192,12 @@ static int service_add_default_dependencies(Service *s) { * majority of services. */ /* First, pull in base system */ - if (UNIT(s)->manager->running_as == MANAGER_SYSTEM) { + if (UNIT(s)->manager->running_as == SYSTEMD_SYSTEM) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0) return r; - } else if (UNIT(s)->manager->running_as == MANAGER_USER) { + } else if (UNIT(s)->manager->running_as == SYSTEMD_USER) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0) return r; @@ -3429,7 +3429,7 @@ static int service_enumerate(Manager *m) { assert(m); - if (m->running_as != MANAGER_SYSTEM) + if (m->running_as != SYSTEMD_SYSTEM) return 0; zero(runlevel_services); |