[systemd-devel] [PATCH 2/2] core/swap.c: Do not add Before=swap.target to swap units.

[Lennart Poettering]

On Sat, 06.10.12 01:11, Thomas Bächler (thomas at archlinux.org) wrote:

> The fstab generator adds Before=swap.target by default, and when creating
> a custom .swap unit, you can also add Before=swap.target to the unit.
> 
> However, it is impossible to not have this ordering dependency right now.
> Virtually all existing setups likely use the fstab generator, so this
> change is unlikely to break anything.

Thanks!

Seems for .mount units we don't generate target deps either in the core
code either, hence we should make the handling of swap unit and mount
units more similar.

Commited!

(It feels so good to commit a patch that just deletes code! ;-))

> ---
>  src/core/swap.c | 19 -------------------
>  1 file changed, 19 deletions(-)
> 
> diff --git a/src/core/swap.c b/src/core/swap.c
> index b4f53b7..c708b7f 100644
> --- a/src/core/swap.c
> +++ b/src/core/swap.c
> @@ -165,22 +165,6 @@ static int swap_add_mount_links(Swap *s) {
>          return 0;
>  }
>  
> -static int swap_add_target_links(Swap *s) {
> -        Unit *tu;
> -        int r;
> -
> -        assert(s);
> -
> -        if (!s->from_fragment)
> -                return 0;
> -
> -        r = manager_load_unit(UNIT(s)->manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu);
> -        if (r < 0)
> -                return r;
> -
> -        return unit_add_dependency(UNIT(s), UNIT_BEFORE, tu, true);
> -}
> -
>  static int swap_add_device_links(Swap *s) {
>          SwapParameters *p;
>  
> @@ -291,9 +275,6 @@ static int swap_load(Unit *u) {
>                  if ((r = swap_add_mount_links(s)) < 0)
>                          return r;
>  
> -                if ((r = swap_add_target_links(s)) < 0)
> -                        return r;
> -
>                  if ((r = unit_add_default_cgroups(u)) < 0)
>                          return r;
>  


Lennart

-- 
Lennart Poettering - Red Hat, Inc.