diff options
Diffstat (limited to 'libnm-core/nm-setting-ip-config.c')
| -rw-r--r-- | libnm-core/nm-setting-ip-config.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 49a3efbd..7f1690ac 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -4921,7 +4921,7 @@ verify_label (const char *label) if (!p) return FALSE; iface = g_strndup (label, p - label); - if (!nm_utils_is_valid_iface_name (iface, NULL)) { + if (!nm_utils_ifname_valid_kernel (iface, NULL)) { g_free (iface); return FALSE; } @@ -5637,10 +5637,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass) * When using dns=default, servers with higher priority will be on top of * resolv.conf. To prioritize a given server over another one within the * same connection, just specify them in the desired order. When multiple - * devices have configurations with the same priority, the one with an - * active default route will be preferred. Negative values have the special + * devices have configurations with the same priority, VPNs will be + * considered first, then devices with the best (lowest metric) default + * route and then all other devices. Negative values have the special * effect of excluding other configurations with a greater priority value; - * so in presence of at least a negative priority, only DNS servers from + * so in presence of at least one negative priority, only DNS servers from * connections with the lowest priority value will be used. * * When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or @@ -5871,7 +5872,11 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass) /** * NMSettingIPConfig:dhcp-timeout: * - * A timeout for a DHCP transaction in seconds. + * A timeout for a DHCP transaction in seconds. If zero (the default), a + * globally configured default is used. If still unspecified, a device specific + * timeout is used (usually 45 seconds). + * + * Set to 2147483647 (MAXINT32) for infinity. **/ obj_properties[PROP_DHCP_TIMEOUT] = g_param_spec_int (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", "", |