mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-04 10:52:18 +00:00
lleyton
a16b7bce95
* chore: sync with Terra 39 * fix: update mock-configs path * fix: use f38 specs for desktops * chore: move more lomiri/unity specific packages (#880) * Fix(ubuntu-sdk): update description & version (#878) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix: disable docs package (#887) * sync more changes from f39 * add keyd fixes --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> Signed-off-by: lleyton <lleyton@fyralabs.com> Co-authored-by: cat-master21 <96554164+cat-master21@users.noreply.github.com>
25 lines
919 B
Diff
25 lines
919 B
Diff
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
|
|
index a8498116d..3682be668 100644
|
|
--- a/pkg/cri/server/helpers.go
|
|
+++ b/pkg/cri/server/helpers.go
|
|
@@ -40,7 +40,7 @@ import (
|
|
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
|
|
+ // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
|
|
imagedigest "github.com/opencontainers/go-digest"
|
|
"github.com/pelletier/go-toml"
|
|
"golang.org/x/net/context"
|
|
@@ -366,8 +366,8 @@ func getRuntimeOptionsType(t string) interface{} {
|
|
return &runcoptions.Options{}
|
|
case plugin.RuntimeLinuxV1:
|
|
return &runctypes.RuncOptions{}
|
|
- case runtimeRunhcsV1:
|
|
- return &runhcsoptions.Options{}
|
|
+ // case runtimeRunhcsV1:
|
|
+ // return &runhcsoptions.Options{}
|
|
default:
|
|
return &runtimeoptions.Options{}
|
|
}
|