diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /src/initrd/nmi-ibft-reader.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'src/initrd/nmi-ibft-reader.c')
| -rw-r--r-- | src/initrd/nmi-ibft-reader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index 47b90ebf..477bc0bf 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -200,23 +200,23 @@ ip_setting_add_from_block (GHashTable *nic, g_return_val_if_reached (FALSE); } g_object_set (s_ip, - NM_SETTING_IP_CONFIG_METHOD, method, - NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, + NM_SETTING_IP_CONFIG_METHOD, method, + NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, NULL); - if (s_gateway && !nm_utils_ipaddr_valid (family, s_gateway)) { + if (s_gateway && !nm_utils_ipaddr_is_valid (family, s_gateway)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid IP gateway '%s'.", s_gateway); return FALSE; } - if (s_dns1 && !nm_utils_ipaddr_valid (family, s_dns1)) { + if (s_dns1 && !nm_utils_ipaddr_is_valid (family, s_dns1)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid DNS1 address '%s'.", s_dns1); return FALSE; } - if (s_dns2 && !nm_utils_ipaddr_valid (family, s_dns2)) { + if (s_dns2 && !nm_utils_ipaddr_is_valid (family, s_dns2)) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "iBFT: invalid DNS2 address '%s'.", s_dns2); return FALSE; |