Skip to content

Commit

Permalink
fix merging #2177 and #2169
Browse files Browse the repository at this point in the history
A new method was added to the cgroup interface when #2177 was merged.

After #2177 got merged, #2169 was merged without rebase (sorry!) and compilation was failing:

  libcontainer/cgroups/fs2/fs2.go:208:22: container.Cgroup undefined (type *configs.Config has no field or method Cgroup)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  • Loading branch information
AkihiroSuda committed Jan 14, 2020
1 parent 5cc0dea commit 5c20ea1
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions libcontainer/cgroups/fs2/fs2.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,10 @@ func (m *manager) Set(container *configs.Config) error {
if len(errs) > 0 && !m.rootless {
return errors.Errorf("error while setting cgroup v2: %+v", errs)
}
m.config = container.Cgroups
return nil
}

func (m *manager) GetCgroups() (*configs.Cgroup, error) {
return m.config, nil
}

0 comments on commit 5c20ea1

Please sign in to comment.