summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorMichal Sekletar <msekleta@redhat.com>2014-10-21 18:38:42 +0200
committerMichal Sekletar <msekleta@redhat.com>2014-10-27 12:20:15 +0100
commitd89b5fed9ea5d9ec293585cb85bb27b56ea6ac9c (patch)
treedb953a318245c62f878dac5c7cf942ab8d85446c /src/core
parent281a92f80c215d6e07526d33563adb6d37c531c6 (diff)
shutdown: do final unmounting only if not running inside the container
If we run in the container then we run in a mount namespace. If namespace dies then kernel should do unmounting for us, hence we skip unmounting in containers. Also, it may be the case that we no longer have capability to do umount, because we are running in the unprivileged container. See: http://lists.freedesktop.org/archives/systemd-devel/2014-October/023536.html
Diffstat (limited to 'src/core')
-rw-r--r--src/core/shutdown.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index d361cbe631..20cf526ba2 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -207,7 +207,7 @@ int main(int argc, char *argv[]) {
in_container = detect_container(NULL) > 0;
- need_umount = true;
+ need_umount = !in_container;
need_swapoff = !in_container;
need_loop_detach = !in_container;
need_dm_detach = !in_container;