diff --git a/libcontainer/cgroups/fs2/fs2.go b/libcontainer/cgroups/fs2/fs2.go index 2d32f8210..4bb7091a1 100644 --- a/libcontainer/cgroups/fs2/fs2.go +++ b/libcontainer/cgroups/fs2/fs2.go @@ -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 +} diff --git a/libcontainer/integration/checkpoint_test.go b/libcontainer/integration/checkpoint_test.go index 44c595e17..cdb681051 100644 --- a/libcontainer/integration/checkpoint_test.go +++ b/libcontainer/integration/checkpoint_test.go @@ -42,6 +42,7 @@ func showFile(t *testing.T, fname string) error { } func TestUsernsCheckpoint(t *testing.T) { + t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)") if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) { t.Skip("userns is unsupported") } @@ -53,6 +54,7 @@ func TestUsernsCheckpoint(t *testing.T) { } func TestCheckpoint(t *testing.T) { + t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)") testCheckpoint(t, false) }