core/swap.c: Do not add Before=swap.target to swap units.

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.
This commit is contained in:
Thomas Bächler 2012-10-06 01:11:53 +02:00 committed by Lennart Poettering
parent 6bae23a038
commit fd59a381e3

View File

@ -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;