fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: s/_nm_connection_type_is_master/_nm_connection_type_is_controller/g

Browse source 
git grep -l _nm_connection_type_is_master |xargs sed 's/_nm_connection_type_is_master/_nm_connection_type_is_controller/g' -i
This commit is contained in:
Lubomir Rintel 2023-01-17 18:47:35 +01:00
parent 173ef46041
commit 9e816a2cae
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/nm-active-connection.c
View file

@ -448,7 +448,7 @@ _set_applied_connection_take(NMActiveConnection *self, NMConnection *applied_con
if (nm_setting_connection_get_master(s_con)) if (nm_setting_connection_get_master(s_con))
flags_val |= NM_ACTIVATION_STATE_FLAG_IS_SLAVE; flags_val |= NM_ACTIVATION_STATE_FLAG_IS_SLAVE;
if (_nm_connection_type_is_master(nm_setting_connection_get_connection_type(s_con))) if (_nm_connection_type_is_controller(nm_setting_connection_get_connection_type(s_con)))
flags_val |= NM_ACTIVATION_STATE_FLAG_IS_MASTER; flags_val |= NM_ACTIVATION_STATE_FLAG_IS_MASTER;
nm_active_connection_set_state_flags_full(self, nm_active_connection_set_state_flags_full(self,

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -2127,7 +2127,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg)
/* Only save the value for master connections */ /* Only save the value for master connections */
type = nm_setting_connection_get_connection_type(s_con); type = nm_setting_connection_get_connection_type(s_con);
if (_nm_connection_type_is_master(type)) { if (_nm_connection_type_is_controller(type)) {
NMSettingConnectionAutoconnectSlaves autoconnect_slaves; NMSettingConnectionAutoconnectSlaves autoconnect_slaves;
autoconnect_slaves = nm_setting_connection_get_autoconnect_slaves(s_con); autoconnect_slaves = nm_setting_connection_get_autoconnect_slaves(s_con);
svSetValueStr(ifcfg, svSetValueStr(ifcfg,

2
src/libnm-core-intern/nm-core-internal.h
View file

@ -548,7 +548,7 @@ GHashTable *_nm_tc_action_get_attributes(NMTCAction *action);
/*****************************************************************************/ /*****************************************************************************/
static inline gboolean static inline gboolean
_nm_connection_type_is_master(const char *type) _nm_connection_type_is_controller(const char *type)
{ {
return (NM_IN_STRSET(type, return (NM_IN_STRSET(type,
NM_SETTING_BOND_SETTING_NAME, NM_SETTING_BOND_SETTING_NAME,