swap: don't try to shutdown swaps on shutdown in a container

[elogind.git] / src / core / swap.c

diff --git a/src/core/swap.c b/src/core/swap.c
index 41ece2708f009a3b52d061ee76e45595659d0161..8ba60559c698455fb48e5ce510c24549c4849b6b 100644 (file)
--- 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 (!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);
                 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 (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;
         r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
         if (r < 0)
                 return r;