diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-17 10:21:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 10:21:20 -0400 |
| commit | 9d2bc4cae81889096f9baa66b1f9f48d6dcd942f (patch) | |
| tree | 0a55271cde0e303ba8a8d30c74d91b731735d258 /pkg/domain | |
| parent | 3bdbe3ce969ac510b8d4ee44da4578da9fed659c (diff) | |
| parent | 4462113c5e1d51b2ac6516afb96a9ae83c00254e (diff) | |
| download | podman-9d2bc4cae81889096f9baa66b1f9f48d6dcd942f.tar.gz podman-9d2bc4cae81889096f9baa66b1f9f48d6dcd942f.tar.bz2 podman-9d2bc4cae81889096f9baa66b1f9f48d6dcd942f.zip | |
Merge pull request #10356 from Luap99/network-reload-rootless
podman network reload add rootless support
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/network.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/network.go b/pkg/domain/infra/abi/network.go index 1a833332c..33ab280e5 100644 --- a/pkg/domain/infra/abi/network.go +++ b/pkg/domain/infra/abi/network.go @@ -71,7 +71,9 @@ func (ic *ContainerEngine) NetworkReload(ctx context.Context, names []string, op report := new(entities.NetworkReloadReport) report.Id = ctr.ID() report.Err = ctr.ReloadNetwork() - if options.All && errors.Cause(report.Err) == define.ErrCtrStateInvalid { + // ignore errors for invalid ctr state and network mode when --all is used + if options.All && (errors.Cause(report.Err) == define.ErrCtrStateInvalid || + errors.Cause(report.Err) == define.ErrNetworkModeInvalid) { continue } reports = append(reports, report) |