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

ifcfg-rh: for ethernet profiles write TYPE before other wired settings

Browse source
This commit is contained in:
Thomas Haller 2021-05-10 22:52:30 +02:00
parent 6f3f25cead
commit 0956354bc5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1162,9 +1162,6 @@ write_wired_setting_impl(NMSettingWired *s_wired, shvarFile *ifcfg, gboolean is_
svSetValueStr(ifcfg, "OPTIONS", tmp->str);
}
if (!is_virtual)
svSetValueStr(ifcfg, "TYPE", TYPE_ETHERNET);
svSetValueTernary(ifcfg,
"ACCEPT_ALL_MAC_ADDRESSES",
nm_setting_wired_get_accept_all_mac_addresses(s_wired));
@ -1185,6 +1182,8 @@ write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
return FALSE;
}
svSetValueStr(ifcfg, "TYPE", TYPE_ETHERNET);
write_wired_setting_impl(s_wired, ifcfg, FALSE);
return TRUE;
}

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