From 30c47c9be92923ad9afca567172216b91f04515a82a20bc4ca8e143a74827d08 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 2 May 2016 07:35:31 +0000 Subject: [PATCH] * 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 --- containerd.changes | 6 ++++++ containerd.service | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/containerd.changes b/containerd.changes index 010ecc3..2fcdd92 100644 --- a/containerd.changes +++ b/containerd.changes @@ -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 diff --git a/containerd.service b/containerd.service index 303b28b..a18bbed 100644 --- a/containerd.service +++ b/containerd.service @@ -10,8 +10,6 @@ ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS LimitNOFILE=1048576 LimitNPROC=1048576 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 # systemd doesn't suddenly decide to mess around with runC's cgroup setup. Delegate=true