diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-09-05 10:00:50 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-09-05 17:12:27 -0400 |
| commit | de9a394fcff19ae4422a3f65502c8790787351fd (patch) | |
| tree | dde244b17ac8c23a87182b82b424c50f81521090 /libpod/boltdb_state.go | |
| parent | a760e325f3180638f9fedd0ee79d4c6695d8ba64 (diff) | |
| download | podman-de9a394fcff19ae4422a3f65502c8790787351fd.tar.gz podman-de9a394fcff19ae4422a3f65502c8790787351fd.tar.bz2 podman-de9a394fcff19ae4422a3f65502c8790787351fd.zip | |
Correctly report errors on unmounting SHM
When we fail to remove a container's SHM, that's an error, and we
need to report it as such. This may be part of our lingering
storage woes.
Also, remove MNT_DETACH. It may be another cause of the storage
removal failures.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/boltdb_state.go')
| -rw-r--r-- | libpod/boltdb_state.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go index acba61f2a..31b551b36 100644 --- a/libpod/boltdb_state.go +++ b/libpod/boltdb_state.go @@ -1403,11 +1403,10 @@ func (s *BoltState) AddVolume(volume *Volume) error { // Volume state is allowed to not exist var volStateJSON []byte if volume.state != nil { - stateJSON, err := json.Marshal(volume.state) + volStateJSON, err = json.Marshal(volume.state) if err != nil { return errors.Wrapf(err, "error marshalling volume %s state to JSON", volume.Name()) } - volStateJSON = stateJSON } db, err := s.getDBCon() |