diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-16 18:57:21 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-16 18:57:21 +0200 |
| commit | 6c155fe3d0634f636e76188b378da174ba02ef52 (patch) | |
| tree | c79ed82e970e5c972ae4a13959dac487315b7a44 | |
| parent | 772a599e4f118fd166d83e7476ed867decefba70 (diff) | |
path,timer: order units after sysinit by default
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | src/path.c | 15 | ||||
| -rw-r--r-- | src/timer.c | 15 |
3 files changed, 26 insertions, 6 deletions
@@ -47,8 +47,6 @@ * default.target must be %ghosted... -* systemd.path muss irgendwie nen sinvolles Defaultdependencies=True kriegen, genaus timer usw. - * In command lines, support both "$FOO" and $FOO * systemd-install disable should recursively kill all symlinks diff --git a/src/path.c b/src/path.c index 2ae6e569ce..a9fa3771ab 100644 --- a/src/path.c +++ b/src/path.c @@ -101,6 +101,18 @@ static int path_verify(Path *p) { return 0; } +static int path_add_default_dependencies(Path *p) { + int r; + + assert(p); + + if (p->meta.manager->running_as == MANAGER_SYSTEM) + if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) + return r; + + return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); +} + static int path_load(Unit *u) { Path *p = PATH(u); int r; @@ -123,9 +135,8 @@ static int path_load(Unit *u) { if ((r = path_add_mount_links(p)) < 0) return r; - /* Path units shouldn't stay around on shutdown */ if (p->meta.default_dependencies) - if ((r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) + if ((r = path_add_default_dependencies(p)) < 0) return r; } diff --git a/src/timer.c b/src/timer.c index 0d4ed27bb4..1580478949 100644 --- a/src/timer.c +++ b/src/timer.c @@ -73,6 +73,18 @@ static int timer_verify(Timer *t) { return 0; } +static int timer_add_default_dependencies(Timer *t) { + int r; + + assert(t); + + if (t->meta.manager->running_as == MANAGER_SYSTEM) + if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) + return r; + + return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); +} + static int timer_load(Unit *u) { Timer *t = TIMER(u); int r; @@ -92,9 +104,8 @@ static int timer_load(Unit *u) { if ((r = unit_add_dependency(u, UNIT_BEFORE, t->unit, true)) < 0) return r; - /* Timers shouldn't stay around on shutdown */ if (t->meta.default_dependencies) - if ((r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) + if ((r = timer_add_default_dependencies(t)) < 0) return r; } |