daemon: fix error-message for minimum allowed kernel-memory limit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3c44ade6d0
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
3ea996abd7
commit
88ca5cec4e
|
@ -477,7 +477,7 @@ func verifyPlatformContainerResources(resources *containertypes.Resources, sysIn
|
||||||
resources.KernelMemory = 0
|
resources.KernelMemory = 0
|
||||||
}
|
}
|
||||||
if resources.KernelMemory > 0 && resources.KernelMemory < linuxMinMemory {
|
if resources.KernelMemory > 0 && resources.KernelMemory < linuxMinMemory {
|
||||||
return warnings, fmt.Errorf("Minimum kernel memory limit allowed is 4MB")
|
return warnings, fmt.Errorf("Minimum kernel memory limit allowed is 6MB")
|
||||||
}
|
}
|
||||||
if resources.KernelMemory > 0 && !kernel.CheckKernelVersion(4, 0, 0) {
|
if resources.KernelMemory > 0 && !kernel.CheckKernelVersion(4, 0, 0) {
|
||||||
warnings = append(warnings, "You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.")
|
warnings = append(warnings, "You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.")
|
||||||
|
|
Loading…
Reference in New Issue