diff options
| -rw-r--r-- | libpod/runtime_pod_linux.go | 2 | ||||
| -rw-r--r-- | pkg/util/mountOpts.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 872e8ea8a..73b6c5d9b 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -236,7 +236,7 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool) } if err := r.removeContainer(ctx, ctr, force, false, true); err != nil { - if removalErr != nil { + if removalErr == nil { removalErr = err } else { logrus.Errorf("Error removing container %s from pod %s: %v", ctr.ID(), p.ID(), err) diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index 329a7c913..929223244 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -108,6 +108,7 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string if foundZ { return nil, errors.Wrapf(ErrDupeMntOption, "only one of 'z' and 'Z' can be used") } + foundZ = true default: return nil, errors.Wrapf(ErrBadMntOption, "unknown mount option %q", opt) } |