fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-04 22:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

config, man: hide connectivity-check command-line options

Browse source 
There is no reason to configure the connectivity-check options from
the command line rather than from the config file. Keep the options,
for backward-compatibility, but remove them from the man page and hide
them from --help.
This commit is contained in:
Dan Winship 2013-03-14 09:23:21 -04:00
parent 8bb9ee8d3b
commit 29ed892de7
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
man/NetworkManager.8.in
View file

@ -10,7 +10,7 @@ NetworkManager \- network management daemon
.SH SYNOPSIS .SH SYNOPSIS
.B NetworkManager [\-\-version] | [\-\-help] .B NetworkManager [\-\-version] | [\-\-help]
.PP .PP
.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>] .B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
.SH DESCRIPTION .SH DESCRIPTION
The \fINetworkManager\fP daemon attempts to make networking configuration and The \fINetworkManager\fP daemon attempts to make networking configuration and
operation as painless and automatic as possible by managing the primary network operation as painless and automatic as possible by managing the primary network
@ -118,23 +118,6 @@ log levels and domains.
Sets which operations are logged to the log destination (usually syslog). By Sets which operations are logged to the log destination (usually syslog). By
default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for
more information on log levels and domains. more information on log levels and domains.
.TP
.I "\-\-connectivity\-uri=<uri>
Sets the URI of a web page that will be used for connectivity checking. By
default connectivity checking is disabled. See \fBNetworkManager.conf\fP(5)
[connectivity] section for more information on connectivity checking feature.
.TP
.I "\-\-connectivity\-interval=<int>
Sets the interval (in seconds) in which connection checks for the URI are done.
0 means no checks. The default value is 300 seconds. See
\fBNetworkManager.conf\fP(5) [connectivity] section for more information on
connectivity checking feature.
.TP
.I "\-\-connectivity\-response=<resp>
If set, it controls what body content NetworkManager checks for when requesting
the URI for connectivity checking. If missing, defaults to "NetworkManager is online".
See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on
connectivity checking feature.
.SH DEBUGGING .SH DEBUGGING
The following environment variables are supported to help debugging. When used The following environment variables are supported to help debugging. When used

8
src/config/nm-config.c
View file

@ -143,9 +143,11 @@ static GOptionEntry config_options[] = {
{ "log-domains", 0, 0, G_OPTION_ARG_STRING, &cli_log_domains, { "log-domains", 0, 0, G_OPTION_ARG_STRING, &cli_log_domains,
N_("Log domains separated by ',': any combination of [%s]"), N_("Log domains separated by ',': any combination of [%s]"),
"PLATFORM,RFKILL,WIFI" }, "PLATFORM,RFKILL,WIFI" },
{ "connectivity-uri", 0, 0, G_OPTION_ARG_STRING, &cli_connectivity_uri, N_("An http(s) address for checking internet connectivity"), "http://example.com" },
{ "connectivity-interval", 0, 0, G_OPTION_ARG_INT, &cli_connectivity_interval, N_("The interval between connectivity checks (in seconds)"), "60" }, /* These three are hidden for now, and should eventually just go away. */
{ "connectivity-response", 0, 0, G_OPTION_ARG_STRING, &cli_connectivity_response, N_("The expected start of the response"), N_("Bingo!") }, { "connectivity-uri", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli_connectivity_uri, N_("An http(s) address for checking internet connectivity"), "http://example.com" },
{ "connectivity-interval", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &cli_connectivity_interval, N_("The interval between connectivity checks (in seconds)"), "60" },
{ "connectivity-response", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &cli_connectivity_response, N_("The expected start of the response"), N_("Bingo!") },
{NULL} {NULL}
}; };
static gboolean config_options_inited; static gboolean config_options_inited;