[systemd-devel] [PATCH] Drop Before=paths/sockets/timers.target from DefaultDependencies.

[Lennart Poettering]

On Tue, 28.01.14 13:12, david at davidstrauss.net (david at davidstrauss.net) wrote:

> From: David Strauss <david at davidstrauss.net>

What's the rationale here?

Documenting what DEfaultDependencies= does is something that has been on
the todo list since a long time, we really should document this.

> 
> ---
>  src/core/path.c   | 5 -----
>  src/core/socket.c | 4 ----
>  src/core/timer.c  | 4 ----
>  3 files changed, 13 deletions(-)
> 
> diff --git a/src/core/path.c b/src/core/path.c
> index fc7069e..95ed015 100644
> --- a/src/core/path.c
> +++ b/src/core/path.c
> @@ -336,11 +336,6 @@ static int path_add_default_dependencies(Path *p) {
>  
>          assert(p);
>  
> -        r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE,
> -                                        SPECIAL_PATHS_TARGET, NULL, true);
> -        if (r < 0)
> -                return r;
> -
>          if (UNIT(p)->manager->running_as == SYSTEMD_SYSTEM) {
>                  r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES,
>                                                        SPECIAL_SYSINIT_TARGET, NULL, true);
> diff --git a/src/core/socket.c b/src/core/socket.c
> index 7eac0eb..4917185 100644
> --- a/src/core/socket.c
> +++ b/src/core/socket.c
> @@ -283,10 +283,6 @@ static int socket_add_default_dependencies(Socket *s) {
>          int r;
>          assert(s);
>  
> -        r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true);
> -        if (r < 0)
> -                return r;
> -
>          if (UNIT(s)->manager->running_as == SYSTEMD_SYSTEM) {
>                  r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true);
>                  if (r < 0)
> diff --git a/src/core/timer.c b/src/core/timer.c
> index a4ff662..ae7a07f 100644
> --- a/src/core/timer.c
> +++ b/src/core/timer.c
> @@ -96,10 +96,6 @@ static int timer_add_default_dependencies(Timer *t) {
>  
>          assert(t);
>  
> -        r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_TIMERS_TARGET, NULL, true);
> -        if (r < 0)
> -                return r;
> -
>          if (UNIT(t)->manager->running_as == SYSTEMD_SYSTEM) {
>                  r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true);
>                  if (r < 0)


Lennart

-- 
Lennart Poettering, Red Hat