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

ifcfg-rh: merge branch 'th/ifcfg-write-wired-setting'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/848
This commit is contained in:
Thomas Haller 2021-05-12 13:45:20 +02:00
commit d0e8a7e2ac
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
7 changed files with 46 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1077,25 +1077,18 @@ write_hostname_setting(NMConnection *connection, shvarFile *ifcfg)
svSetValueInt64_cond(ifcfg, "HOSTNAME_ONLY_FROM_DEFAULT", t != NM_TERNARY_DEFAULT, t);
}
static gboolean
write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
static void
write_wired_setting_impl(NMSettingWired *s_wired, shvarFile *ifcfg, gboolean is_virtual)
{
NMSettingWired * s_wired;
const char *const *s390_subchannels;
guint32 mtu, num_opts, i;
guint32 mtu;
guint32 num_opts;
guint32 i;
const char *const *macaddr_blacklist;
s_wired = nm_connection_get_setting_wired(connection);
if (!s_wired) {
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_FAILED,
"Missing '%s' setting",
NM_SETTING_WIRED_SETTING_NAME);
return FALSE;
}
svSetValueStr(ifcfg, "HWADDR", nm_setting_wired_get_mac_address(s_wired));
svSetValue(ifcfg,
"HWADDR",
nm_setting_wired_get_mac_address(s_wired) ?: (is_virtual ? "" : NULL));
svSetValueStr(ifcfg, "MACADDR", nm_setting_wired_get_cloned_mac_address(s_wired));
@ -1169,12 +1162,42 @@ write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
svSetValueStr(ifcfg, "OPTIONS", tmp->str);
}
svSetValueStr(ifcfg, "TYPE", TYPE_ETHERNET);
svSetValueTernary(ifcfg,
"ACCEPT_ALL_MAC_ADDRESSES",
nm_setting_wired_get_accept_all_mac_addresses(s_wired));
}
static gboolean
write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
{
NMSettingWired *s_wired;
s_wired = nm_connection_get_setting_wired(connection);
if (!s_wired) {
g_set_error(error,
NM_SETTINGS_ERROR,
NM_SETTINGS_ERROR_FAILED,
"Missing '%s' setting",
NM_SETTING_WIRED_SETTING_NAME);
return FALSE;
}
svSetValueStr(ifcfg, "TYPE", TYPE_ETHERNET);
write_wired_setting_impl(s_wired, ifcfg, FALSE);
return TRUE;
}
static gboolean
write_wired_for_virtual(NMConnection *connection, shvarFile *ifcfg)
{
NMSettingWired *s_wired;
s_wired = nm_connection_get_setting_wired(connection);
if (!s_wired)
return FALSE;
write_wired_setting_impl(s_wired, ifcfg, TRUE);
return TRUE;
}
@ -1372,39 +1395,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)
{

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected
View file

@ -1,5 +1,5 @@
HWADDR=00:22:15:59:62:97
TYPE=Ethernet
HWADDR=00:22:15:59:62:97
BRIDGING_OPTS="priority=28 hairpin_mode=1"
NAME="System test-bridge-component"
UUID=${UUID}

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
View file

@ -1,5 +1,5 @@
HWADDR=00:22:15:59:62:97
TYPE=Ethernet
HWADDR=00:22:15:59:62:97
NAME="System test-bridge-component"
UUID=${UUID}
DEVICE=eth0

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
View file

@ -1,5 +1,5 @@
HWADDR=00:11:22:33:44:EE
TYPE=Ethernet
HWADDR=00:11:22:33:44:EE
KEY_MGMT=IEEE8021X
IEEE_8021X_EAP_METHODS=PEAP
IEEE_8021X_IDENTITY="Jara Cimrman"

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected
View file

@ -1,6 +1,6 @@
TYPE=Ethernet
HWADDR=31:33:33:37:BE:CD
MTU=1492
TYPE=Ethernet
BRIDGING_OPTS="priority=50 path_cost=33"
BRIDGE_PORT_VLANS="1 untagged,2 pvid,4-4094 untagged"
NAME="Test Write Bridge Component"

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
View file

@ -1,6 +1,6 @@
TYPE=Ethernet
HWADDR=31:33:33:37:BE:CD
MTU=1492
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=none

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
View file

@ -1,5 +1,5 @@
HWADDR=00:16:41:11:22:33
TYPE=Ethernet
HWADDR=00:16:41:11:22:33
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp