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

WIP: settings/ifcfg-rh: s/master/controller/

Browse source
This commit is contained in:
Lubomir Rintel 2023-01-17 18:48:43 +01:00
parent 2792038e0b
commit 1dcd9efd9e
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -290,17 +290,17 @@ check_if_bond_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
{
gs_free char *value = NULL;
const char *v;
const char *master;
const char *controller;
v = svGetValueStr(ifcfg, "MASTER_UUID", &value);
if (!v)
v = svGetValueStr(ifcfg, "MASTER", &value);
if (v) {
master = nm_setting_connection_get_controller(s_con);
if (master) {
controller = nm_setting_connection_get_controller(s_con);
if (controller) {
PARSE_WARNING("Already configured as slave of %s. Ignoring MASTER{_UUID}=\"%s\"",
master,
controller,
v);
return;
}
@ -323,7 +323,7 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
{
gs_free char *value = NULL;
const char *v;
const char *master;
const char *controller;
v = svGetValueStr(ifcfg, "TEAM_MASTER_UUID", &value);
if (!v)
@ -331,10 +331,10 @@ check_if_team_slave(shvarFile *ifcfg, NMSettingConnection *s_con)
if (!v)
return;
master = nm_setting_connection_get_controller(s_con);
if (master) {
controller = nm_setting_connection_get_controller(s_con);
if (controller) {
PARSE_WARNING("Already configured as slave of %s. Ignoring TEAM_MASTER{_UUID}=\"%s\"",
master,
controller,
v);
return;
}
@ -6638,7 +6638,7 @@ connection_from_file_full(const char *filename,
gs_free char *bond_options = NULL;
if (svGetValueStr(main_ifcfg, "BONDING_OPTS", &bond_options)) {
/* initscripts consider these as bond masters */
/* initscripts consider these as bond controllers */
g_free(type);
type = g_strdup(TYPE_BOND);
}

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

@ -2097,7 +2097,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg)
{
guint32 n, i;
nm_auto_free_gstring GString *str = NULL;
const char *master, *master_iface = NULL, *type;
const char *controller, *controller_iface = NULL, *type;
int vint;
gint32 vint32;
NMSettingConnectionMdns mdns;
@ -2125,7 +2125,7 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg)
vint = nm_setting_connection_get_multi_connect(s_con);
svSetValueInt64_cond(ifcfg, "MULTI_CONNECT", vint != NM_CONNECTION_MULTI_CONNECT_DEFAULT, vint);
/* Only save the value for master connections */
/* Only save the value for controller connections */
type = nm_setting_connection_get_connection_type(s_con);
if (_nm_connection_type_is_controller(type)) {
NMSettingConnectionAutoconnectSlaves autoconnect_slaves;
@ -2185,46 +2185,46 @@ write_connection_setting(NMSettingConnection *s_con, shvarFile *ifcfg)
mud_url = nm_setting_connection_get_mud_url(s_con);
svSetValue(ifcfg, "MUD_URL", mud_url);
master = nm_setting_connection_get_controller(s_con);
if (master) {
controller = nm_setting_connection_get_controller(s_con);
if (controller) {
/* The reader prefers the *_UUID variants, however we still try to resolve
* it into an interface name, so that legacy tooling is not confused. */
if (!nm_utils_get_testing()) {
/* This is conditional for easier testing. */
master_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, master);
controller_iface = nm_manager_iface_for_uuid(NM_MANAGER_GET, controller);
}
if (!master_iface) {
master_iface = master;
master = NULL;
if (!controller_iface) {
controller_iface = controller;
controller = NULL;
}
if (nm_setting_connection_is_slave_type(s_con, NM_SETTING_BOND_SETTING_NAME)) {
svSetValueStr(ifcfg, "MASTER_UUID", master);
svSetValueStr(ifcfg, "MASTER", master_iface);
svSetValueStr(ifcfg, "MASTER_UUID", controller);
svSetValueStr(ifcfg, "MASTER", controller_iface);
svSetValueStr(ifcfg, "SLAVE", "yes");
} else if (nm_setting_connection_is_slave_type(s_con, NM_SETTING_BRIDGE_SETTING_NAME)) {
svSetValueStr(ifcfg, "BRIDGE_UUID", master);
svSetValueStr(ifcfg, "BRIDGE", master_iface);
svSetValueStr(ifcfg, "BRIDGE_UUID", controller);
svSetValueStr(ifcfg, "BRIDGE", controller_iface);
} else if (nm_setting_connection_is_slave_type(s_con, NM_SETTING_TEAM_SETTING_NAME)) {
svSetValueStr(ifcfg, "TEAM_MASTER_UUID", master);
svSetValueStr(ifcfg, "TEAM_MASTER", master_iface);
svSetValueStr(ifcfg, "TEAM_MASTER_UUID", controller);
svSetValueStr(ifcfg, "TEAM_MASTER", controller_iface);
if (NM_IN_STRSET(type, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_VLAN_SETTING_NAME))
svUnsetValue(ifcfg, "TYPE");
} else if (nm_setting_connection_is_slave_type(s_con, NM_SETTING_OVS_PORT_SETTING_NAME)) {
svSetValueStr(ifcfg, "OVS_PORT_UUID", master);
svSetValueStr(ifcfg, "OVS_PORT", master_iface);
svSetValueStr(ifcfg, "OVS_PORT_UUID", controller);
svSetValueStr(ifcfg, "OVS_PORT", controller_iface);
} else if (nm_setting_connection_is_slave_type(s_con, NM_SETTING_VRF_SETTING_NAME)) {
svSetValueStr(ifcfg, "VRF_UUID", master);
svSetValueStr(ifcfg, "VRF", master_iface);
svSetValueStr(ifcfg, "VRF_UUID", controller);
svSetValueStr(ifcfg, "VRF", controller_iface);
} else {
_LOGW("don't know how to set master for a %s slave",
_LOGW("don't know how to set controller for a %s slave",
nm_setting_connection_get_slave_type(s_con));
}
}
if (nm_streq0(type, NM_SETTING_TEAM_SETTING_NAME))
svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM);
else if (master_iface
else if (controller_iface
&& nm_setting_connection_is_slave_type(s_con, NM_SETTING_TEAM_SETTING_NAME))
svSetValueStr(ifcfg, "DEVICETYPE", TYPE_TEAM_PORT);