summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-08-24 23:07:03 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-03 18:59:05 -0700
commitc0387ebfb672d16e194201e04f8185545e1a5914 (patch)
tree350f3944bbcac9080489c3fe69a8e80861c56ec5 /src
parenta5c3034fa7089ae680b3b95da33936870f7b493f (diff)
swap: don't try to shutdown swaps on shutdown in a container
Diffstat (limited to 'src')
-rw-r--r--src/core/swap.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/swap.c b/src/core/swap.c
index 41ece2708f..8ba60559c6 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;