mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
daemon/graphdriver/overlay2: remove deprecated overrideKernelCheck
Commit955c1f881a
(Docker v17.12.0) replaced detection of support for multiple lowerdirs (as required by overlay2) to not depend on the kernel version. The `overlay2.override_kernel_check` was still used to print a warning that older kernel versions may not have full support. After this, commite226aea280
(Docker v20.10.0, backported to v19.03.7) removed uses of the `overlay2.override_kernel_check` option altogether, but we were still parsing it. This patch changes the `parseOptions()` function to not parse the option, printing a deprecation warning instead. We should change this to be an error, but the `overlay2.override_kernel_check` option was not deprecated in the documentation, so keeping it around for one more release. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
b43a7ac530
commit
e35700eb50
1 changed files with 3 additions and 6 deletions
|
@ -85,8 +85,7 @@ const (
|
|||
)
|
||||
|
||||
type overlayOptions struct {
|
||||
overrideKernelCheck bool
|
||||
quota quota.Quota
|
||||
quota quota.Quota
|
||||
}
|
||||
|
||||
// Driver contains information about the home directory and the list of active
|
||||
|
@ -236,10 +235,8 @@ func parseOptions(options []string) (*overlayOptions, error) {
|
|||
key = strings.ToLower(key)
|
||||
switch key {
|
||||
case "overlay2.override_kernel_check":
|
||||
o.overrideKernelCheck, err = strconv.ParseBool(val)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// TODO(thaJeztah): change this to an error, see https://github.com/docker/cli/pull/3806
|
||||
logger.Warn("DEPRECATED: the overlay2.override_kernel_check option is ignored and will be removed in the next release. You can safely remove this option from your configuration.")
|
||||
case "overlay2.size":
|
||||
size, err := units.RAMInBytes(val)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue