* Remove MountFlags=slave from containerd.service. This causes many issues with

interactions with Docker.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=11
This commit is contained in:
Aleksa Sarai 2016-05-02 07:35:31 +00:00 committed by Git OBS Bridge
parent b2a9550fa4
commit 30c47c9be9
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 2 07:34:53 UTC 2016 - asarai@suse.de
* Remove MountFlags=slave from containerd.service. This causes many issues with
interactions with Docker.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 29 09:54:28 UTC 2016 - asarai@suse.de Fri Apr 29 09:54:28 UTC 2016 - asarai@suse.de

View File

@ -10,8 +10,6 @@ ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
LimitCORE=infinity LimitCORE=infinity
# We don't want to trash the root mount namespace.
MountFlags=slave
# While containerd doesn't directly modify cgroups, we have to make sure that # While containerd doesn't directly modify cgroups, we have to make sure that
# systemd doesn't suddenly decide to mess around with runC's cgroup setup. # systemd doesn't suddenly decide to mess around with runC's cgroup setup.
Delegate=true Delegate=true