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

keyfile: suppress bogus warning about [ethernet-s390-options] setting

Browse source 
S390 options are stored in a separate [ethernet-s390-options] section.
This group must not be interpreted as a NMSetting name, otherwise we
log a bogus warning:

  <warn>  [1590523563.7757] keyfile: ethernet-s390-options: invalid setting name 'ethernet-s390-options'

Fixes: cf9b8d3bad ('libnm/keyfile: implement ethernet.s390-options in keyfile')
(cherry picked from commit 82a468c9ad)
(cherry picked from commit d611647997)
This commit is contained in:
Thomas Haller 2020-05-26 22:45:01 +02:00
parent 321311ff7d
commit e9f2831ab5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnm-core/nm-keyfile.c
View file

@ -3558,7 +3558,8 @@ nm_keyfile_read (GKeyFile *keyfile,
vpn_secrets = TRUE;
} else if (NM_STR_HAS_PREFIX (groups[i], NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER))
_read_setting_wireguard_peer (&info);
else if (nm_streq (groups[i], NM_KEYFILE_GROUP_NMMETA)) {
else if (NM_IN_STRSET (groups[i], NM_KEYFILE_GROUP_NMMETA,
ETHERNET_S390_OPTIONS_GROUP_NAME)) {
/* pass */
} else
_read_setting (&info);