diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-08-02 18:31:56 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-08-02 18:31:56 +0000 |
commit | c5d8c1c4c1452f9289fc7d266d8b478c2c32141c (patch) | |
tree | 5c6b70d9cbf398822ef9019ad3eca4e58099f517 /runsc/boot/controller.go | |
parent | 4ada05164233f3ae4515921004f74e51fa07d65c (diff) | |
parent | aaaefdf9cadf033fa281b612315c3227f5ab1c7a (diff) |
Merge aaaefdf9 (automated)
Diffstat (limited to 'runsc/boot/controller.go')
-rw-r--r-- | runsc/boot/controller.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index d79aaff60..f1e4a9ba4 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -328,10 +328,8 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error { return fmt.Errorf("at most two files may be passed to Restore") } - networkStack := cm.l.k.NetworkStack() - // Destroy the old kernel and create a new kernel. + // Pause the kernel while we build a new one. cm.l.k.Pause() - cm.l.k.Destroy() p, err := createPlatform(cm.l.conf, deviceFile) if err != nil { @@ -345,6 +343,7 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error { return fmt.Errorf("creating memory file: %v", err) } k.SetMemoryFile(mf) + networkStack := cm.l.k.NetworkStack() cm.l.k = k // Set up the restore environment. |