From 030f7b370f65af6f69542333e6232ab6d75fcad7 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Wed, 8 Mar 2017 14:49:32 -0800 Subject: [PATCH] Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe Signed-off-by: Kenfe-Mickael Laventure --- hack/dockerfile/binaries-commits | 2 +- vendor.conf | 2 +- .../opencontainers/runc/libcontainer/cgroups/utils.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits index 927c70f360..3a08e1ea62 100755 --- a/hack/dockerfile/binaries-commits +++ b/hack/dockerfile/binaries-commits @@ -3,7 +3,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly -RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 +RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe CONTAINERD_COMMIT=977c511eda0925a723debdc94d09459af49d082a TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e diff --git a/vendor.conf b/vendor.conf index 80e9ec1e7c..95818cec81 100644 --- a/vendor.conf +++ b/vendor.conf @@ -60,7 +60,7 @@ github.com/docker/go v1.5.1-1-1-gbaf439e github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly -github.com/opencontainers/runc a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 https://github.com/docker/runc.git # libcontainer +github.com/opencontainers/runc 54296cf40ad8143b62dbcaa1d90e520a2136ddfe https://github.com/docker/runc.git # libcontainer github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json) diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go index 8946dd5959..c6db0039e6 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go @@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount, if sepIdx == -1 { return nil, fmt.Errorf("invalid mountinfo format") } - if txt[sepIdx+3:sepIdx+9] != "cgroup" { + if txt[sepIdx+3:sepIdx+10] == "cgroup2" || txt[sepIdx+3:sepIdx+9] != "cgroup" { continue } fields := strings.Split(txt, " ")