From c0387ebfb672d16e194201e04f8185545e1a5914 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Aug 2012 23:07:03 +0200 Subject: [PATCH] swap: don't try to shutdown swaps on shutdown in a container --- src/core/swap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/swap.c b/src/core/swap.c index 41ece2708..8ba60559c 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -174,7 +174,8 @@ static int swap_add_target_links(Swap *s) { if (!s->from_fragment) return 0; - if ((r = manager_load_unit(UNIT(s)->manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 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); @@ -212,6 +213,9 @@ static int swap_add_default_dependencies(Swap *s) { if (UNIT(s)->manager->running_as != MANAGER_SYSTEM) return 0; + if (detect_container(NULL) > 0) + return 0; + r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true); if (r < 0) return r; -- 2.30.2