diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 15:47:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-16 15:47:43 +0200 |
commit | acf86ef5ab9c5307fe0bdc93bf534decaafe38ae (patch) | |
tree | 29bfdc95ad26c85062d67e53fde894ac9e284834 /libpod | |
parent | 0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6 (diff) | |
parent | e46a06ecf6c028776c0e28b5689ff7d8a9e7d43c (diff) | |
download | podman-acf86ef5ab9c5307fe0bdc93bf534decaafe38ae.tar.gz podman-acf86ef5ab9c5307fe0bdc93bf534decaafe38ae.tar.bz2 podman-acf86ef5ab9c5307fe0bdc93bf534decaafe38ae.zip |
Merge pull request #7653 from AkihiroSuda/fix-7652
Fix "rootless-cni-infra + runc fails with ENODEV"
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/rootless_cni_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/rootless_cni_linux.go b/libpod/rootless_cni_linux.go index 31097dd16..7feec6b44 100644 --- a/libpod/rootless_cni_linux.go +++ b/libpod/rootless_cni_linux.go @@ -255,7 +255,7 @@ func startRootlessCNIInfraContainer(ctx context.Context, r *Runtime) (*Container Destination: "/etc/cni/net.d", Type: "bind", Source: r.config.Network.NetworkConfigDir, - Options: []string{"ro"}, + Options: []string{"ro", "bind"}, } g.AddMount(etcCNINetD) |