diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-11 21:35:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 21:35:45 +0200 |
| commit | d614372c2f39cea32641ec92c84a9e48657cfb41 (patch) | |
| tree | 032338943b478c70e6ded7c103cea0311481cca8 /cmd/podman/shared/create_cli.go | |
| parent | 2b64f8844655b7188332a404ec85d32c33feb9e9 (diff) | |
| parent | a78c885397ad2938b9b21438bcfa8a00dd1eb03f (diff) | |
| download | podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.gz podman-d614372c2f39cea32641ec92c84a9e48657cfb41.tar.bz2 podman-d614372c2f39cea32641ec92c84a9e48657cfb41.zip | |
Merge pull request #3552 from baude/golangcilint2
golangci-lint pass number 2
Diffstat (limited to 'cmd/podman/shared/create_cli.go')
| -rw-r--r-- | cmd/podman/shared/create_cli.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/shared/create_cli.go b/cmd/podman/shared/create_cli.go index 4bfef8b62..08a40b206 100644 --- a/cmd/podman/shared/create_cli.go +++ b/cmd/podman/shared/create_cli.go @@ -133,7 +133,7 @@ func verifyContainerResources(config *cc.CreateConfig, update bool) ([]string, e if config.Resources.KernelMemory > 0 && config.Resources.KernelMemory < linuxMinMemory { return warnings, fmt.Errorf("minimum kernel memory limit allowed is 4MB") } - if config.Resources.DisableOomKiller == true && !sysInfo.OomKillDisable { + if config.Resources.DisableOomKiller && !sysInfo.OomKillDisable { // only produce warnings if the setting wasn't to *disable* the OOM Kill; no point // warning the caller if they already wanted the feature to be off warnings = addWarning(warnings, "Your kernel does not support OomKillDisable. OomKillDisable discarded.") |