fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 11:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: cleanup write_wired_for_virtual() to return-early

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

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

@ -1082,7 +1082,9 @@ write_wired_setting(NMConnection *connection, shvarFile *ifcfg, GError **error)
{
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);
@ -1182,33 +1184,31 @@ static gboolean
write_wired_for_virtual(NMConnection *connection, shvarFile *ifcfg)
{
NMSettingWired *s_wired;
gboolean has_wired = FALSE;
const char * device_mac;
const char * cloned_mac;
guint32 mtu;
s_wired = nm_connection_get_setting_wired(connection);
if (s_wired) {
const char *device_mac, *cloned_mac;
guint32 mtu;
if (!s_wired)
return FALSE;
has_wired = TRUE;
device_mac = nm_setting_wired_get_mac_address(s_wired);
svSetValue(ifcfg, "HWADDR", device_mac ?: "");
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);
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));
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));
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;
mtu = nm_setting_wired_get_mtu(s_wired);
svSetValueInt64_cond(ifcfg, "MTU", mtu != 0, mtu);
return TRUE;
}
static void