Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

sandbox: remove network before stopping vm #1957

Merged
merged 1 commit into from
Aug 13, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions virtcontainers/sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -1473,16 +1473,16 @@ func (s *Sandbox) Stop(force bool) error {
}
}

if err := s.stopVM(); err != nil && !force {
// Remove the network.
if err := s.removeNetwork(); err != nil && !force {
return err
}

if err := s.setSandboxState(types.StateStopped); err != nil {
if err := s.stopVM(); err != nil && !force {
return err
}

// Remove the network.
if err := s.removeNetwork(); err != nil && !force {
if err := s.setSandboxState(types.StateStopped); err != nil {
return err
}

Expand Down