fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 13:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh/trivial: move code

Browse source
This commit is contained in:
Thomas Haller 2021-05-10 22:29:36 +02:00
parent 18ca3803b5
commit 46eb75d746
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1178,6 +1178,39 @@ write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
return TRUE;
}
static gboolean
write_wired_for_virtual(NMConnection *connection, shvarFile *ifcfg)
{
NMSettingWired *s_wired;
gboolean has_wired = FALSE;
s_wired = nm_connection_get_setting_wired(connection);
if (s_wired) {
const char *device_mac, *cloned_mac;
guint32 mtu;
has_wired = TRUE;
device_mac = nm_setting_wired_get_mac_address(s_wired);
svSetValue(ifcfg, "HWADDR", device_mac ?: "");
cloned_mac = nm_setting_wired_get_cloned_mac_address(s_wired);
svSetValueStr(ifcfg, "MACADDR", cloned_mac);
svSetValueStr(ifcfg,
"GENERATE_MAC_ADDRESS_MASK",
nm_setting_wired_get_generate_mac_address_mask(s_wired));
svSetValueTernary(ifcfg,
"ACCEPT_ALL_MAC_ADDRESSES",
nm_setting_wired_get_accept_all_mac_addresses(s_wired));
mtu = nm_setting_wired_get_mtu(s_wired);
svSetValueInt64_cond(ifcfg, "MTU", mtu != 0, mtu);
}
return has_wired;
}
static void
_ethtool_gstring_prepare(GString **str, gboolean *is_first, char cmdline_flag, const char *iface)
{
@ -1372,39 +1405,6 @@ vlan_priority_maplist_to_stringlist(NMSettingVlan *s_vlan, NMVlanPriorityMap map
return value;
}
static gboolean
write_wired_for_virtual(NMConnection *connection, shvarFile *ifcfg)
{
NMSettingWired *s_wired;
gboolean has_wired = FALSE;
s_wired = nm_connection_get_setting_wired(connection);
if (s_wired) {
const char *device_mac, *cloned_mac;
guint32 mtu;
has_wired = TRUE;
device_mac = nm_setting_wired_get_mac_address(s_wired);
svSetValue(ifcfg, "HWADDR", device_mac ?: "");
cloned_mac = nm_setting_wired_get_cloned_mac_address(s_wired);
svSetValueStr(ifcfg, "MACADDR", cloned_mac);
svSetValueStr(ifcfg,
"GENERATE_MAC_ADDRESS_MASK",
nm_setting_wired_get_generate_mac_address_mask(s_wired));
svSetValueTernary(ifcfg,
"ACCEPT_ALL_MAC_ADDRESSES",
nm_setting_wired_get_accept_all_mac_addresses(s_wired));
mtu = nm_setting_wired_get_mtu(s_wired);
svSetValueInt64_cond(ifcfg, "MTU", mtu != 0, mtu);
}
return has_wired;
}
static gboolean
write_vlan_setting(NMConnection *connection, shvarFile *ifcfg, gboolean *wired, GError **error)
{