diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:52 +0100 |
| commit | b6357ff41de179d0aa2e35a6d574e5749fe09002 (patch) | |
| tree | ff038e98f4569fa3ba217266e6d288410ed84cd4 /src/libnm-core-impl/nm-setting-ovs-interface.c | |
| parent | 535ecf92edd8ad054ae8102a224c3dd8f3acf967 (diff) | |
| parent | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (diff) | |
Update upstream source from tag 'upstream/1.45.90'
Update to upstream version '1.45.90' with Debian dir d723a85d75b9a8958dee17b97673a3fd9a80e18c
Diffstat (limited to 'src/libnm-core-impl/nm-setting-ovs-interface.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-ovs-interface.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libnm-core-impl/nm-setting-ovs-interface.c b/src/libnm-core-impl/nm-setting-ovs-interface.c index 34e66480..88379087 100644 --- a/src/libnm-core-impl/nm-setting-ovs-interface.c +++ b/src/libnm-core-impl/nm-setting-ovs-interface.c @@ -312,16 +312,16 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have a master."), + _("A connection with a '%s' setting must have a controller."), NM_SETTING_OVS_INTERFACE_SETTING_NAME); g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_MASTER); + NM_SETTING_CONNECTION_CONTROLLER); return FALSE; } - slave_type = nm_setting_connection_get_slave_type(s_con); + slave_type = nm_setting_connection_get_port_type(s_con); if (slave_type && !nm_streq(slave_type, NM_SETTING_OVS_PORT_SETTING_NAME)) { g_set_error(error, NM_CONNECTION_ERROR, @@ -334,7 +334,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) g_prefix_error(error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, - NM_SETTING_CONNECTION_SLAVE_TYPE); + NM_SETTING_CONNECTION_PORT_TYPE); return FALSE; } } @@ -394,7 +394,8 @@ nm_setting_ovs_interface_class_init(NMSettingOvsInterfaceClass *klass) PROP_TYPE, NM_SETTING_PARAM_INFERRABLE, NMSettingOvsInterface, - type); + type, + .direct_string_allow_empty = TRUE); /** * NMSettingOvsInterface:ofport-request: * |