summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-05-10 22:29:36 +0200
committerThomas Haller <thaller@redhat.com>2021-05-12 13:43:36 +0200
commit46eb75d746202a563249ce0b2978450a925fd4e6 (patch)
tree1fdec89825e3d6526de972f231438fb2d90b7460
parent18ca3803b5bb58162acfcee66f7ac7fe2c6b4f05 (diff)
downloadNetworkManager-46eb75d746202a563249ce0b2978450a925fd4e6.tar.gz
ifcfg-rh/trivial: move code
-rw-r--r--src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 00c7c33c5c..a787e1e0cb 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -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)
{
@@ -1373,39 +1406,6 @@ vlan_priority_maplist_to_stringlist(NMSettingVlan *s_vlan, NMVlanPriorityMap map
}
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)
{
NMSettingVlan *s_vlan;