diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-08 21:40:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 21:40:44 +0100 |
| commit | 94b784255cf849c6d9024def6355fc1cf67c8cbf (patch) | |
| tree | a6b5f7803cee8174ee1202401b1a7cedfb352723 | |
| parent | 96b1d5642c4630e7ecbd0bb3b22c4f620157d874 (diff) | |
| parent | ae1637bbd09f199a5004538d53426993e362ed7d (diff) | |
| download | podman-94b784255cf849c6d9024def6355fc1cf67c8cbf.tar.gz podman-94b784255cf849c6d9024def6355fc1cf67c8cbf.tar.bz2 podman-94b784255cf849c6d9024def6355fc1cf67c8cbf.zip | |
Merge pull request #4401 from mheon/revert_4216
Revert "catch runc v2 error" [v1.6]
| -rw-r--r-- | libpod/container_internal.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 028d7601d..c0a6960cd 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -947,13 +947,6 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error { // With the spec complete, do an OCI create if err := c.ociRuntime.CreateContainer(c, nil); err != nil { - // Fedora 31 is carrying a patch to display improved error - // messages to better handle the V2 transition. This is NOT - // upstream in any OCI runtime. - // TODO: Remove once runc supports cgroupsv2 - if strings.Contains(err.Error(), "this version of runc doesn't work on cgroups v2") { - logrus.Errorf("oci runtime %q does not support CGroups V2: use system migrate to mitigate", c.ociRuntime.Name()) - } return err } |