Skip to content

Commit

Permalink
Merge pull request containers#4401 from mheon/revert_4216
Browse files Browse the repository at this point in the history
Revert "catch runc v2 error" [v1.6]
  • Loading branch information
openshift-merge-robot authored Nov 8, 2019
2 parents 96b1d56 + ae1637b commit 94b7842
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions libpod/container_internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 94b7842

Please sign in to comment.