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

bond: log only skipped bond options if they are set in the profile

Browse source
This commit is contained in:
Thomas Haller 2020-07-03 12:43:34 +02:00
parent 4aa46328ca
commit 3a25b3bfc7
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/devices/nm-device-bond.c
View file

@ -248,13 +248,17 @@ set_bond_attr_or_default (NMDevice *device,
const char *opt)
{
NMDeviceBond *self = NM_DEVICE_BOND (device);
const char *value = nm_setting_bond_get_option_or_default (s_bond, opt);
const char *value;
if (value) {
_set_bond_attr (device, opt, value);
} else {
_LOGD (LOGD_BOND, "bond option %s rejected due to incompatibility", opt);
value = nm_setting_bond_get_option_or_default (s_bond, opt);
if (!value) {
if ( _LOGT_ENABLED (LOGD_BOND)
&& nm_setting_bond_get_option_by_name (s_bond, opt))
_LOGT (LOGD_BOND, "bond option '%s' not set as it conflicts with other options", opt);
return;
}
_set_bond_attr (device, opt, value);
}
static gboolean