Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home into AG-21485

This commit is contained in:
Artem Krisanov 2023-04-18 14:27:28 +03:00
commit 521aedc5bc

View file

@ -249,13 +249,15 @@ var cmdLineOpts = []cmdLineOpt{{
updateNoValue: func(o options) (options, error) { o.noEtcHosts = true; return o, nil }, updateNoValue: func(o options) (options, error) { o.noEtcHosts = true; return o, nil },
effect: func(_ options, _ string) (f effect, err error) { effect: func(_ options, _ string) (f effect, err error) {
log.Info( log.Info(
"warning: --no-etc-hosts flag is deprecated and will be removed in the future versions", "warning: --no-etc-hosts flag is deprecated " +
"and will be removed in the future versions; " +
"set clients.runtime_sources.hosts in the configuration file to false instead",
) )
return nil, nil return nil, nil
}, },
serialize: func(o options) (val string, ok bool) { return "", o.noEtcHosts }, serialize: func(o options) (val string, ok bool) { return "", o.noEtcHosts },
description: "Deprecated. Do not use the OS-provided hosts.", description: "Deprecated: use clients.runtime_sources.hosts instead. Do not use the OS-provided hosts.",
longName: "no-etc-hosts", longName: "no-etc-hosts",
shortName: "", shortName: "",
}, { }, {