if (!p->noauto &&
(p->handle || s->meta.manager->swap_auto) &&
- !s->from_fragment &&
+ s->from_etc_fstab &&
s->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
if (s->meta.manager->running_as == MANAGER_SYSTEM) {
- if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
- return r;
-
- if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
if ((r = unit_set_description(u, s->what)) < 0)
return r;
-
if ((r = swap_add_device_links(s)) < 0)
return r;
if ((r = swap_add_target_links(s)) < 0)
return r;
+ if ((r = unit_add_default_cgroup(u)) < 0)
+ return r;
+
if (s->meta.default_dependencies)
if ((r = swap_add_default_dependencies(s)) < 0)
return r;