opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8196 from giuseppe/specgen-swap-limit-err-message

Browse Source 
specgen: fix error message
This commit is contained in:
OpenShift Merge Robot
2020-10-30 18:22:47 +01:00
committed by GitHub
parent 5eebe3dd3d 433fea303e
commit 37b550c96a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/specgen/generate/validate.go
View File

@ -38,7 +38,7 @@ func verifyContainerResources(s *specgen.SpecGenerator) ([]string, error) {
memory.Swap = nil memory.Swap = nil
} }
if memory.Limit != nil && memory.Swap != nil && !sysInfo.SwapLimit { if memory.Limit != nil && memory.Swap != nil && !sysInfo.SwapLimit {
warnings = append(warnings, "Your kernel does not support swap limit capabilities,or the cgroup is not mounted. Memory limited without swap.") warnings = append(warnings, "Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.")
memory.Swap = nil memory.Swap = nil
} }
if memory.Limit != nil && memory.Swap != nil && *memory.Swap < *memory.Limit { if memory.Limit != nil && memory.Swap != nil && *memory.Swap < *memory.Limit {