diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-07 21:00:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-07 21:00:35 +0000 |
| commit | 009580d88e7b5077bb1df88f731bbcfc60826d38 (patch) | |
| tree | 95b7acbf9ffa0237347df9c9ae4da18a398880c1 /runsc/boot/controller.go | |
| parent | e3a366f06fa97b6c58eee09e619de697fa42378c (diff) | |
| parent | 6a9823794975d2401ae1bda3937a63de959192ab (diff) | |
Merge release-20190806.1-244-g6a98237 (automated)
Diffstat (limited to 'runsc/boot/controller.go')
| -rw-r--r-- | runsc/boot/controller.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index 72cbabd16..26a60d5b8 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -27,7 +27,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/control" "gvisor.dev/gvisor/pkg/sentry/fs" "gvisor.dev/gvisor/pkg/sentry/kernel" - "gvisor.dev/gvisor/pkg/sentry/socket/epsocket" + "gvisor.dev/gvisor/pkg/sentry/socket/netstack" "gvisor.dev/gvisor/pkg/sentry/state" "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sentry/watchdog" @@ -142,7 +142,7 @@ func newController(fd int, l *Loader) (*controller, error) { } srv.Register(manager) - if eps, ok := l.k.NetworkStack().(*epsocket.Stack); ok { + if eps, ok := l.k.NetworkStack().(*netstack.Stack); ok { net := &Network{ Stack: eps.Stack, } @@ -355,7 +355,7 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error { fs.SetRestoreEnvironment(*renv) // Prepare to load from the state file. - if eps, ok := networkStack.(*epsocket.Stack); ok { + if eps, ok := networkStack.(*netstack.Stack); ok { stack.StackFromEnv = eps.Stack // FIXME(b/36201077) } info, err := specFile.Stat() |