mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-08 22:20:19 +01:00
merge: branch 'lr/connection-add'
https://bugzilla.gnome.org/show_bug.cgi?id=766427
This commit is contained in:
Lubomir Rintel
commit
67905347b2
12 changed files with 1844 additions and 5267 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -993,240 +993,8 @@ _nmcli()
|
|||
fi
|
||||
;;
|
||||
a|ad|add)
|
||||
if [[ ${#words[@]} -eq 3 ]]; then
|
||||
_nmcli_compl_COMMAND "${words[2]}" type ifname con-name autoconnect master slave-type
|
||||
elif [[ ${#words[@]} -gt 3 ]]; then
|
||||
_nmcli_array_delete_at words 0 1
|
||||
|
||||
LONG_OPTIONS=(help)
|
||||
HELP_ONLY_AS_FIRST=1
|
||||
_nmcli_compl_OPTIONS
|
||||
case $? in
|
||||
0)
|
||||
return 0
|
||||
;;
|
||||
1)
|
||||
if [[ "$HELP_ONLY_AS_FIRST" == 1 ]]; then
|
||||
_nmcli_compl_COMMAND "${words[2]}" type ifname con-name autoconnect master slave-type
|
||||
fi
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
|
||||
OPTIONS_TYPE=
|
||||
OPTIONS=(type ifname con-name autoconnect save master slave-type)
|
||||
OPTIONS_MANDATORY=(type ifname)
|
||||
COMMAND_ARGS_WAIT_OPTIONS=1
|
||||
OPTIONS_MANDATORY_IFNAME=1
|
||||
_nmcli_compl_ARGS && return 0
|
||||
|
||||
OPTIONS_MANDATORY_IFNAME=
|
||||
if _nmcli_array_has_value OPTIONS "${OPTIONS_MANDATORY[@]}"; then
|
||||
# we still have some missing mandatory options...
|
||||
if [[ "$OPTIONS_UNKNOWN_OPTION" != '' ]]; then
|
||||
if ! _nmcli_array_has_value OPTIONS "${OPTIONS_UNKNOWN_OPTION:1}"; then
|
||||
# if we encountered an unknown option while having mandatory
|
||||
# options, just return.
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}")"
|
||||
return 0
|
||||
fi
|
||||
|
||||
OPTIONS_IP=(ip4 ip6 gw4 gw6)
|
||||
OPTIONS_SEP=(--)
|
||||
OPTIONS_MANDATORY=()
|
||||
case "$OPTIONS_TYPE" in
|
||||
802-3|802-3-|802-3-e|802-3-et|802-3-eth|802-3-ethe|802-3-ether|802-3-ethern|802-3-etherne|802-3-ethernet| \
|
||||
e|et|eth|ethe|ether|ethern|etherne|ethernet)
|
||||
OPTIONS_TYPE=ethernet
|
||||
OPTIONS_TYPED=(mac cloned-mac mtu)
|
||||
;;
|
||||
802-11-w|802-11-wi|802-11-wir|802-11-wire|802-11-wirel|802-11-wirele|802-11-wireles|802-11-wireless| \
|
||||
wif|wifi)
|
||||
OPTIONS_TYPE=wifi
|
||||
OPTIONS_TYPED=(ssid mac cloned-mac mtu mode)
|
||||
OPTIONS_MANDATORY=(ssid)
|
||||
;;
|
||||
wim|wima|wimax)
|
||||
OPTIONS_TYPE=wimax
|
||||
OPTIONS_TYPED=(mac nsp)
|
||||
;;
|
||||
g|gs|gsm)
|
||||
OPTIONS_TYPE=gsm
|
||||
OPTIONS_TYPED=(apn user password)
|
||||
OPTIONS_MANDATORY=(apn)
|
||||
;;
|
||||
c|cd|cdm|cdma)
|
||||
OPTIONS_TYPE=cdma
|
||||
OPTIONS_TYPED=(user password)
|
||||
;;
|
||||
i|in|inf|infi|infin|infini|infinib|infiniba|infiniban|infiniband)
|
||||
OPTIONS_TYPE=infiniband
|
||||
OPTIONS_TYPED=(mac mtu transport-mode parent p-key)
|
||||
;;
|
||||
bl|blu|blue|bluet|blueto|bluetoo|bluetoot|bluetooth)
|
||||
OPTIONS_TYPE=bluetooth
|
||||
OPTIONS_TYPED=(addr bt-type)
|
||||
;;
|
||||
vl|vla|vlan)
|
||||
OPTIONS_TYPE=vlan
|
||||
OPTIONS_TYPED=(dev id flags ingress egress mtu)
|
||||
OPTIONS_MANDATORY=(dev)
|
||||
;;
|
||||
bond)
|
||||
OPTIONS_TYPE=bond
|
||||
OPTIONS_TYPED=(mode miimon downdelay updelay arp-interval arp-ip-target primary lacp-rate)
|
||||
;;
|
||||
team)
|
||||
OPTIONS_TYPE=team
|
||||
OPTIONS_TYPED=(config)
|
||||
;;
|
||||
bridge)
|
||||
OPTIONS_TYPE=bridge
|
||||
OPTIONS_TYPED=(stp priority forward-delay hello-time max-age ageing-time mac)
|
||||
;;
|
||||
vp|vpn)
|
||||
OPTIONS_TYPE=vpn
|
||||
OPTIONS_TYPED=(vpn-type user)
|
||||
OPTIONS_MANDATORY=(vpn-type)
|
||||
;;
|
||||
802-11-o|802-11-ol|802-11-olp|802-11-olpc|802-11-olpc-|802-11-olpc-m|802-11-olpc-me|802-11-olpc-mes|802-11-olpc-mesh| \
|
||||
o|ol|olp|olpc|olpc-|olpc-m|olpc-me|olpc-mes|olpc-mesh)
|
||||
OPTIONS_TYPE=olpc-mesh
|
||||
OPTIONS_TYPED=(ssid channel dhcp-anycast)
|
||||
OPTIONS_MANDATORY=(ssid)
|
||||
;;
|
||||
p|pp|ppp|pppo|pppoe)
|
||||
OPTIONS_TYPE=pppoe
|
||||
OPTIONS_TYPED=(username password service mtu mac)
|
||||
OPTIONS_MANDATORY=(username)
|
||||
;;
|
||||
a|ad|ads|adsl)
|
||||
OPTIONS_TYPE=adsl
|
||||
OPTIONS_TYPED=(username password protocol encapsulation)
|
||||
OPTIONS_MANDATORY=(username protocol)
|
||||
;;
|
||||
tu|tun)
|
||||
OPTIONS_TYPE=tun
|
||||
OPTIONS_TYPED=(mode owner group pi vnet-hdr multi-queue)
|
||||
OPTIONS_MANDATORY=(mode)
|
||||
;;
|
||||
ip|ip-|ip-t|ip-tu|ip-tun|ip-tunn|ip-tunne|ip-tunnel)
|
||||
OPTIONS_TYPE=ip-tunnel
|
||||
OPTIONS_TYPED=(mode remote local dev)
|
||||
OPTIONS_MANDATORY=(mode remote)
|
||||
;;
|
||||
m|ma|mac|macv|macvl|macvla|macvlan)
|
||||
OPTIONS_TYPE=macvlan
|
||||
OPTIONS_TYPED=(dev mode tap)
|
||||
OPTIONS_MANDATORY=(dev mode)
|
||||
;;
|
||||
vx|vxl|vxla|vxlan)
|
||||
OPTIONS_TYPE=vxlan
|
||||
OPTIONS_TYPED=(id remote local dev source-port-min source-port-max destination-port)
|
||||
OPTIONS_MANDATORY=(id remote)
|
||||
;;
|
||||
*)
|
||||
# for an unknown connection type, we stop completion here
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then
|
||||
# means, we are at the end of options. Nothing more to parse, just show
|
||||
# what are the options now.
|
||||
if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_TYPED[@]}")"
|
||||
else
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_TYPED[@]}") $(echo "${OPTIONS_IP[@]}") $(echo "${OPTIONS_SEP[@]}")"
|
||||
fi
|
||||
return 0
|
||||
fi
|
||||
if [[ "${#OPTIONS[@]}" -gt 0 ]]; then
|
||||
# we still have some options from before, but no mandatory ones. Mix them with OPTIONS_TYPED
|
||||
# and continue parsing the options...
|
||||
OPTIONS=("${OPTIONS[@]}" "${OPTIONS_TYPED[@]}")
|
||||
OPTIONS_NEXT_GROUP=("${OPTIONS_TYPED[@]}")
|
||||
_nmcli_compl_ARGS && return 0
|
||||
|
||||
if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then
|
||||
# means, we are at the end of options. Nothing more to parse, just show
|
||||
# what are the options now.
|
||||
if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}")"
|
||||
else
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}") $(echo "${OPTIONS_IP[@]}") $(echo "${OPTIONS_SEP[@]}")"
|
||||
fi
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then
|
||||
# there was an unknown option specified. Maybe we have to stop with the completion.
|
||||
if [[ "${#OPTIONS_MANDATORY[@]}" -gt 0 ]]; then
|
||||
# we have an unknown option, but still mandatory ones that must be fullfiled first.
|
||||
return 0
|
||||
fi
|
||||
if ! (_nmcli_array_has_value OPTIONS_IP "${OPTIONS_UNKNOWN_OPTION:1}" ||
|
||||
_nmcli_array_has_value OPTIONS_SEP "${OPTIONS_UNKNOWN_OPTION:1}"); then
|
||||
# the unknown option is neither an IP option nor a separator.
|
||||
return 0
|
||||
fi
|
||||
# The unknown option is an IP option or a separator, which is fine... continue...
|
||||
fi
|
||||
|
||||
fi
|
||||
OPTIONS=("${OPTIONS_TYPED[@]}")
|
||||
OPTIONS_NEXT_GROUP=()
|
||||
|
||||
if [[ "${#OPTIONS_MANDATORY[@]}" -ge 1 ]]; then
|
||||
# we have some mandatory options... don't check for IP options yet...
|
||||
_nmcli_compl_ARGS && return 0
|
||||
|
||||
if _nmcli_array_has_value OPTIONS "${OPTIONS_MANDATORY[@]}"; then
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}")"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then
|
||||
if ! (_nmcli_array_has_value OPTIONS_IP "${OPTIONS_UNKNOWN_OPTION:1}" ||
|
||||
_nmcli_array_has_value OPTIONS_SEP "${OPTIONS_UNKNOWN_OPTION:1}"); then
|
||||
# the unknown option is neither an IP option nor a separator.
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# no mandatory options... do final completion including IP options
|
||||
OPTIONS=("${OPTIONS[@]}" "${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}")
|
||||
OPTIONS_NEXT_GROUP=("${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}")
|
||||
_nmcli_compl_ARGS && return 0
|
||||
|
||||
if [[ "$OPTIONS_UNKNOWN_OPTION" != "" ]]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [[ "$COMMAND_ARGS_WAIT_OPTIONS" -ne 1 ]]; then
|
||||
# means, we are at the end of options. Nothing more to parse, just show
|
||||
# what are the options now.
|
||||
_nmcli_list "$(echo "${OPTIONS[@]}")"
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
||||
# process the last group of options, as the OPTIONS_TYPED are already handled...
|
||||
OPTIONS=("${OPTIONS_IP[@]}" "${OPTIONS_SEP[@]}")
|
||||
OPTIONS_NEXT_GROUP=("${OPTIONS_SEP[@]}")
|
||||
COMMAND_ARGS_WAIT_OPTIONS=0
|
||||
_nmcli_compl_ARGS && return 0
|
||||
|
||||
_nmcli_array_delete_at words 0
|
||||
_nmcli_compl_PROPERTIES type "$OPTIONS_TYPE"
|
||||
|
||||
return 0
|
||||
|
||||
fi
|
||||
_nmcli_array_delete_at words 0 1
|
||||
_nmcli_list_nl "$(nmcli --complete-args connection add "${words[@]}" 2>/dev/null)"
|
||||
;;
|
||||
e|ed|edi|edit)
|
||||
if [[ ${#words[@]} -eq 3 ]]; then
|
||||
|
|
|
|||
|
|
@ -2405,7 +2405,44 @@ nmc_setting_custom_init (NMSetting *setting)
|
|||
{
|
||||
g_return_if_fail (NM_IS_SETTING (setting));
|
||||
|
||||
if (NM_IS_SETTING_IP4_CONFIG (setting)) {
|
||||
if (NM_IS_SETTING_VLAN (setting)) {
|
||||
/* Set sensible initial VLAN values */
|
||||
g_object_set (NM_SETTING_VLAN (setting),
|
||||
NM_SETTING_VLAN_ID, 1,
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_INFINIBAND (setting)) {
|
||||
/* Initialize 'transport-mode' so that 'infiniband' is valid */
|
||||
g_object_set (NM_SETTING_INFINIBAND (setting),
|
||||
NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_CDMA (setting)) {
|
||||
/* Initialize 'number' so that 'cdma' is valid */
|
||||
g_object_set (NM_SETTING_CDMA (setting),
|
||||
NM_SETTING_CDMA_NUMBER, "#777",
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_GSM (setting)) {
|
||||
/* Initialize 'number' so that 'gsm' is valid */
|
||||
g_object_set (NM_SETTING_GSM (setting),
|
||||
NM_SETTING_GSM_NUMBER, "*99#",
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_OLPC_MESH (setting)) {
|
||||
g_object_set (NM_SETTING_OLPC_MESH (setting),
|
||||
NM_SETTING_OLPC_MESH_CHANNEL, 1,
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_WIRELESS (setting)) {
|
||||
/* For Wi-Fi set mode to "infrastructure". Even though mode == NULL
|
||||
* is regarded as "infrastructure", explicit value makes no doubts.
|
||||
*/
|
||||
g_object_set (NM_SETTING_WIRELESS (setting),
|
||||
NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
|
||||
NULL);
|
||||
nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting));
|
||||
} else if (NM_IS_SETTING_ADSL (setting)) {
|
||||
/* Initialize a protocol */
|
||||
g_object_set (NM_SETTING_ADSL (setting),
|
||||
NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE,
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_IP4_CONFIG (setting)) {
|
||||
g_object_set (NM_SETTING_IP_CONFIG (setting),
|
||||
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
|
||||
NULL);
|
||||
|
|
@ -2415,11 +2452,14 @@ nmc_setting_custom_init (NMSetting *setting)
|
|||
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
|
||||
NULL);
|
||||
nmc_setting_ip6_connect_handlers (NM_SETTING_IP_CONFIG (setting));
|
||||
} else if (NM_IS_SETTING_WIRELESS (setting)) {
|
||||
g_object_set (NM_SETTING_WIRELESS (setting),
|
||||
NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
|
||||
} else if (NM_IS_SETTING_TUN (setting)) {
|
||||
g_object_set (NM_SETTING_TUN (setting),
|
||||
NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN,
|
||||
NULL);
|
||||
} else if (NM_IS_SETTING_BLUETOOTH (setting)) {
|
||||
g_object_set (NM_SETTING_BLUETOOTH (setting),
|
||||
NM_SETTING_BLUETOOTH_TYPE, NM_SETTING_BLUETOOTH_TYPE_PANU,
|
||||
NULL);
|
||||
nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2997,6 +3037,32 @@ done:
|
|||
}
|
||||
|
||||
/* --- NM_SETTING_CONNECTION_SETTING_NAME property setter functions --- */
|
||||
static gboolean
|
||||
nmc_property_connection_set_type (NMSetting *setting, const char *prop, const char *val, GError **error)
|
||||
{
|
||||
gs_free char *uuid = NULL;
|
||||
|
||||
if (nm_setting_connection_get_uuid (NM_SETTING_CONNECTION (setting))) {
|
||||
/* Don't allow setting type unless the connection is brand new.
|
||||
* Just because it's a bad idea and the user wouldn't probably want that.
|
||||
* No technical reason, really.
|
||||
* Also, using uuid to see if the connection is brand new is a bit
|
||||
* hacky: we can not see if the type is already set, because
|
||||
* nmc_setting_set_property() is called only after the property
|
||||
* we're setting (type) has been removed. */
|
||||
g_set_error (error, 1, 0, _("Can not change the connection type"));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
uuid = nm_utils_uuid_generate ();
|
||||
g_object_set (G_OBJECT (setting),
|
||||
NM_SETTING_CONNECTION_UUID, uuid,
|
||||
NULL);
|
||||
|
||||
g_object_set (G_OBJECT (setting), prop, val, NULL);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Setting/removing UUID has been forbidden.
|
||||
|
|
@ -6149,7 +6215,7 @@ nmc_properties_init (void)
|
|||
NULL);
|
||||
nmc_add_prop_funcs (GLUE (CONNECTION, TYPE),
|
||||
nmc_property_connection_get_type,
|
||||
NULL, /* read-only */
|
||||
nmc_property_connection_set_type,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ ipv6.ip6-privacy=0
|
|||
<para>
|
||||
Not all properties can be overwritten, only the following
|
||||
properties are supported to have their default values configured
|
||||
(see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details).
|
||||
(see <link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link> for details).
|
||||
A default value is only consulted if the corresponding per-connection value
|
||||
explicitly allows for that.
|
||||
<variablelist>
|
||||
|
|
@ -1055,11 +1055,11 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
|
|||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli-examples'><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-online'><citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
</para>
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@
|
|||
value of /etc/NetworkManager/NetworkManager.conf is used with
|
||||
a fallback to the older 'nm-system-settings.conf' if located
|
||||
in the same directory. See
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
|
||||
for more information on configuration file.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
Sets how much information NetworkManager sends to the log destination (usually
|
||||
syslog's "daemon" facility). By default, only informational, warning, and error
|
||||
messages are logged. See the section on <literal>logging</literal> in
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
|
||||
for more information.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -377,7 +377,7 @@
|
|||
A comma-separated list specifying which operations are logged to the log
|
||||
destination (usually syslog). By default, most domains are logging-enabled.
|
||||
See the section on <literal>logging</literal> in
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
|
||||
for more information.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -490,11 +490,11 @@
|
|||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli-examples'><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-online'><citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@
|
|||
</refsect1>
|
||||
|
||||
<refsect1 id='see_also'><title>See Also</title>
|
||||
<para><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
<para><link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>.</para>
|
||||
</refsect1>
|
||||
|
||||
</refentry>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
The plugin currently supports reading and writing Ethernet, Wi-Fi, InfiniBand,
|
||||
VLAN, Bond, Bridge, and Team connections. Unsupported connection types (such as
|
||||
WWAN, PPPoE, VPN, or ADSL) are handled by <emphasis>keyfile</emphasis> plugin
|
||||
(<citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
|
||||
(<link linkend='nm-settings-keyfile'><citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>).
|
||||
The main reason for using <emphasis>ifcfg-rh</emphasis> plugin is the compatibility
|
||||
with legacy configurations for <emphasis>ifup</emphasis> and <emphasis>ifdown</emphasis>
|
||||
(initscripts).
|
||||
|
|
@ -311,12 +311,12 @@ DEVICETYPE=TeamPort
|
|||
<para><filename>/usr/share/doc/initscripts/sysconfig.txt</filename></para>
|
||||
</refsect1>
|
||||
<refsect1 id='see_also'><title>See Also</title>
|
||||
<para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para>
|
||||
<para><link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-settings-keyfile'><citerefentry><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli-examples'><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></link></para>
|
||||
</refsect1>
|
||||
</refentry>
|
||||
</xsl:template>
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ id=4
|
|||
There are several exceptions to this rule, mainly for making keyfile syntax easier
|
||||
for humans. The exceptions handled specially by <emphasis>keyfile</emphasis>
|
||||
plugin are listed below. Refer to
|
||||
<citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
<link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>
|
||||
for all available settings and properties and their description.
|
||||
</para>
|
||||
<formalpara><title>Name aliases</title>
|
||||
|
|
@ -246,12 +246,12 @@ id=4
|
|||
</refsect1>
|
||||
|
||||
<refsect1 id='see_also'><title>See Also</title>
|
||||
<para><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></para>
|
||||
<para><link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-settings-ifcfg-rh'><citerefentry><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli-examples'><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></link></para>
|
||||
</refsect1>
|
||||
</refentry>
|
||||
</xsl:template>
|
||||
|
|
|
|||
|
|
@ -117,10 +117,10 @@
|
|||
</refsect1>
|
||||
|
||||
<refsect1 id='see_also'><title>See Also</title>
|
||||
<para><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></para>
|
||||
<para><link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='nmcli-examples'><citerefentry><refentrytitle>nmcli-examples</refentrytitle><manvolnum>7</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link></para>
|
||||
</refsect1>
|
||||
</refentry>
|
||||
</xsl:template>
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<xsl:template match="property">
|
||||
<xsl:variable name="setting_name" select="../@name"/>
|
||||
<row>
|
||||
<entry align="left"><xsl:value-of select="@name"/></entry>
|
||||
<entry align="left"><xsl:attribute name="id">nm-settings.property.<xsl:value-of select="../@name"/>.<xsl:value-of select="@name"/></xsl:attribute><xsl:value-of select="@name"/></entry>
|
||||
<entry align="left"><xsl:value-of select="@type"/></entry>
|
||||
<entry align="left"><xsl:value-of select="@default"/></entry>
|
||||
<entry><xsl:value-of select="@description"/><xsl:if test="@type = 'NMSettingSecretFlags (uint32)'"> (see <xref linkend="secrets-flags"/> for flag values)</xsl:if></entry>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
<para>
|
||||
<emphasis>nmcli</emphasis> is a command-line client for NetworkManager. It
|
||||
allows controlling NetworkManager and reporting its status. For more information
|
||||
please refer to <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
please refer to <link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>
|
||||
manual page.
|
||||
</para>
|
||||
<para>
|
||||
|
|
@ -173,7 +173,7 @@ B,DISPATCH</screen>
|
|||
<para>
|
||||
The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and
|
||||
IP domains. The second command restores the default logging state. Please refer to the
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> manual page
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link> manual page
|
||||
for available logging levels and domains.
|
||||
</para>
|
||||
</example>
|
||||
|
|
@ -297,7 +297,7 @@ fi
|
|||
Wi-Fi will be turned back on.
|
||||
Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/
|
||||
directory.
|
||||
See <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
See <link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>
|
||||
manual page for more information about NetworkManager dispatcher scripts.
|
||||
</para>
|
||||
</example>
|
||||
|
|
@ -543,11 +543,11 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
|
|||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>,
|
||||
<link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-settings'><citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>,
|
||||
<link linkend='nm-online'><citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
</para>
|
||||
|
|
|
|||
1637
man/nmcli.xml
1637
man/nmcli.xml
File diff suppressed because it is too large
Load diff
|
|
@ -120,10 +120,10 @@
|
|||
</refsect1>
|
||||
|
||||
<refsect1 id='see_also'><title>See Also</title>
|
||||
<para><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<para><link linkend='nmcli'><citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry></link>,
|
||||
<citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
<link linkend='NetworkManager'><citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry></link>.</para>
|
||||
</refsect1>
|
||||
|
||||
</refentry>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue