diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-23 11:04:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 11:04:48 +0200 |
| commit | dade9159e7a0f848e101221274faa3f4f03cf132 (patch) | |
| tree | 4fc8aa7a9379260c103d86c37cfc0a2ad511a9e9 /pkg/util/utils.go | |
| parent | 2d24487ba244e5cd900f6aecc5d8896e1354d1ee (diff) | |
| parent | 2faeb2189f81b6925d80aa8031cb5b19aa8618cb (diff) | |
| download | podman-dade9159e7a0f848e101221274faa3f4f03cf132.tar.gz podman-dade9159e7a0f848e101221274faa3f4f03cf132.tar.bz2 podman-dade9159e7a0f848e101221274faa3f4f03cf132.zip | |
Merge pull request #7054 from mheon/backports_203
Backports and Release Notes for v2.0.3
Diffstat (limited to 'pkg/util/utils.go')
| -rw-r--r-- | pkg/util/utils.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 47d3e231d..9eeb116c0 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -555,7 +555,7 @@ func ValidatePullType(pullType string) (PullType, error) { switch pullType { case "always": return PullImageAlways, nil - case "missing": + case "missing", "IfNotPresent": return PullImageMissing, nil case "never": return PullImageNever, nil @@ -641,7 +641,7 @@ func ValidateSysctls(strSlice []string) (map[string]string, error) { } } if !foundMatch { - return nil, errors.Errorf("sysctl '%s' is not whitelisted", arr[0]) + return nil, errors.Errorf("sysctl '%s' is not allowed", arr[0]) } } return sysctl, nil |