diff options
| author | Matthew Heon <mheon@redhat.com> | 2019-10-31 14:16:39 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-10-31 14:17:27 -0400 |
| commit | ae1637bbd09f199a5004538d53426993e362ed7d (patch) | |
| tree | e745746b2b60842f64ea48e1b035946125494fd4 /libpod/container_internal.go | |
| parent | a15a20d3c5898017e1549028fd8960d421240918 (diff) | |
| download | podman-ae1637bbd09f199a5004538d53426993e362ed7d.tar.gz podman-ae1637bbd09f199a5004538d53426993e362ed7d.tar.bz2 podman-ae1637bbd09f199a5004538d53426993e362ed7d.zip | |
Revert "catch runc v2 error"
This reverts commit c35d71e3da7a84eae94769e005407cf99d1ccb49.
This is a Fedora-specific patch we do not want in upstream
releases.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/container_internal.go')
| -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 } |