diff options
-rw-r--r-- | src/core/swap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/swap.c b/src/core/swap.c index 726bda2f37..22827a296c 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -197,12 +197,11 @@ static int swap_add_device_dependencies(Swap *s) { return 0; if (is_device_path(s->what)) - return unit_add_node_dependency(UNIT(s), s->what, MANAGER_IS_SYSTEM(UNIT(s)->manager), UNIT_BINDS_TO, UNIT_DEPENDENCY_FILE); - else - /* File based swap devices need to be ordered after - * systemd-remount-fs.service, since they might need a - * writable file system. */ - return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, true, UNIT_DEPENDENCY_FILE); + return unit_add_node_dependency(UNIT(s), s->what, false, UNIT_BINDS_TO, UNIT_DEPENDENCY_FILE); + + /* File based swap devices need to be ordered after systemd-remount-fs.service, + * since they might need a writable file system. */ + return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, true, UNIT_DEPENDENCY_FILE); } static int swap_add_default_dependencies(Swap *s) { |