From ae1637bbd09f199a5004538d53426993e362ed7d Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 31 Oct 2019 14:16:39 -0400 Subject: [PATCH] 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 --- libpod/container_internal.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 028d7601db..c0a6960cd3 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 }