diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2022-04-04 13:14:35 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2022-04-04 15:40:12 +0200 |
| commit | 164b64ea3baa8502a23fc0c7674f4a7e60507aa0 (patch) | |
| tree | 88e060255b3869822171c1eb200f3afaf1740ebd /pkg/specgenutil | |
| parent | d1f3a2d6a82ed66d4dab5be62821bc59bfb84dd8 (diff) | |
| download | podman-164b64ea3baa8502a23fc0c7674f4a7e60507aa0.tar.gz podman-164b64ea3baa8502a23fc0c7674f4a7e60507aa0.tar.bz2 podman-164b64ea3baa8502a23fc0c7674f4a7e60507aa0.zip | |
specgen: do not set OOMScoreAdj by default
do not force a value of OOMScoreAdj=0 if it is wasn't specified by the
user.
Closes: https://github.com/containers/podman/issues/13731
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/specgenutil')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 186d3862b..7d4fca846 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -753,8 +753,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.PreserveFDs = c.PreserveFDs } - if s.OOMScoreAdj == nil || c.OOMScoreAdj != 0 { - s.OOMScoreAdj = &c.OOMScoreAdj + if s.OOMScoreAdj == nil || c.OOMScoreAdj != nil { + s.OOMScoreAdj = c.OOMScoreAdj } if c.Restart != "" { splitRestart := strings.Split(c.Restart, ":") |