summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-09 14:08:48 -0400
committerGitHub <noreply@github.com>2020-09-09 14:08:48 -0400
commit68dace0619b86196c38945d0918181272656a254 (patch)
treea71959eb447e35b066e4def95ae7e62476322060 /pkg
parent9c4c883d7976a3bd72aef9b9bb8e8757959f4fe4 (diff)
parent7b69b99db7c1b762495db60aab0fc5bce8c20796 (diff)
downloadpodman-68dace0619b86196c38945d0918181272656a254.tar.gz
podman-68dace0619b86196c38945d0918181272656a254.tar.bz2
podman-68dace0619b86196c38945d0918181272656a254.zip
Merge pull request #7573 from rhatdan/oom
Make oom-score-adj actually work
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/oci.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index fd324c6e1..b57ddf1aa 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -353,6 +353,9 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
configSpec.Annotations[define.InspectAnnotationInit] = define.InspectResponseFalse
}
+ if s.OOMScoreAdj != nil {
+ g.SetProcessOOMScoreAdj(*s.OOMScoreAdj)
+ }
setProcOpts(s, &g)
return configSpec, nil