summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-22 12:12:25 +0100
committerGitHub <noreply@github.com>2022-03-22 12:12:25 +0100
commit095f97100f9a5e5425eaf794016c57ecf17506a3 (patch)
treefae5971aba18782321bd6a1f267d1f412b44c70b
parentb726d75f20822b4a23a679acd94696b924a6a374 (diff)
parent1b68c38262f828218bf9d5686b94b8df7563a170 (diff)
downloadpodman-095f97100f9a5e5425eaf794016c57ecf17506a3.tar.gz
podman-095f97100f9a5e5425eaf794016c57ecf17506a3.tar.bz2
podman-095f97100f9a5e5425eaf794016c57ecf17506a3.zip
Merge pull request #13577 from giuseppe/drop-fedora-31-warning
libpod: drop warning for Fedora 31
-rw-r--r--libpod/container_internal.go7
1 files changed, 0 insertions, 7 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 3c21cade8..00019e69c 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1087,13 +1087,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
}