diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-08-20 01:41:09 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-08-20 01:41:09 +0000 |
commit | c304e026dfa8aa6c1c317aae97618bf85410fca1 (patch) | |
tree | 097c4d9061307f82c99b15b5e3e65df5fd4c3a43 /runsc/boot/controller.go | |
parent | 2e9d7f0d7353614e7bbee5fec525f7fb7183f593 (diff) | |
parent | be76c7ce6eb8f2a76c876b500aefc6f0fd8e30ba (diff) |
Merge release-20200810.0-69-gbe76c7ce6 (automated)
Diffstat (limited to 'runsc/boot/controller.go')
-rw-r--r-- | runsc/boot/controller.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index 626a3816e..68a2b45cf 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -33,6 +33,7 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/stack" "gvisor.dev/gvisor/pkg/urpc" "gvisor.dev/gvisor/runsc/boot/pprof" + "gvisor.dev/gvisor/runsc/config" "gvisor.dev/gvisor/runsc/specutils" ) @@ -220,7 +221,7 @@ type StartArgs struct { Spec *specs.Spec // Config is the runsc-specific configuration for the sandbox. - Conf *Config + Conf *config.Config // CID is the ID of the container to start. CID string |