diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2023-01-24 12:00:42 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2023-03-16 12:00:40 +0100 |
| commit | 71ee9d903358ebeaa30182c608c0770a854e8889 (patch) | |
| tree | f238bb04042e982416a8bbb469817ca008771603 /src/core/settings | |
| parent | a6802cfa74a0208ffd3d7ce684431ae9bebff484 (diff) | |
| download | NetworkManager-71ee9d903358ebeaa30182c608c0770a854e8889.tar.gz | |
device: add @check_properties argument to check_connection_compatible()
No change in behavior for now.
Diffstat (limited to 'src/core/settings')
| -rw-r--r-- | src/core/settings/nm-settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c index e6ac5d0941..d5edb7cd8b 100644 --- a/src/core/settings/nm-settings.c +++ b/src/core/settings/nm-settings.c @@ -535,7 +535,7 @@ _startup_complete_check_is_ready(NMSettings *self, /* Check that device is compatible with the device. We are also happy * with a device compatible but for which the connection is disallowed * by NM configuration. */ - if (!nm_device_check_connection_compatible(device, conn, &error) + if (!nm_device_check_connection_compatible(device, conn, TRUE, &error) && !g_error_matches(error, NM_UTILS_ERROR, NM_UTILS_ERROR_CONNECTION_AVAILABLE_DISALLOWED)) @@ -3641,7 +3641,7 @@ have_connection_for_device(NMSettings *self, NMDevice *device) c_list_for_each_entry (sett_conn, &priv->connections_lst_head, _connections_lst) { NMConnection *connection = nm_settings_connection_get_connection(sett_conn); - if (!nm_device_check_connection_compatible(device, connection, NULL)) + if (!nm_device_check_connection_compatible(device, connection, TRUE, NULL)) continue; if (nm_settings_connection_default_wired_get_device(sett_conn)) |