shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2012-08-24 23:07:03 +02:00
parent a5c3034fa7
commit c0387ebfb6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/swap.c
View File

@ -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;