diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-26 22:45:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-26 22:45:10 +0200 |
| commit | 82a468c9ad40ba18281beabea6f9c627fe3e881d (patch) | |
| tree | 265c951ccdd35119e606ef42d4f6951af5b937f5 /shared/nm-keyfile/nm-keyfile.c | |
| parent | 5d5be6b3a366cfcd730e9ddf932f09b9e051dcc6 (diff) | |
| download | NetworkManager-82a468c9ad40ba18281beabea6f9c627fe3e881d.tar.gz | |
keyfile: suppress bogus warning about [ethernet-s390-options] setting
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: cf9b8d3badfd ('libnm/keyfile: implement ethernet.s390-options in keyfile')
Diffstat (limited to 'shared/nm-keyfile/nm-keyfile.c')
| -rw-r--r-- | shared/nm-keyfile/nm-keyfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c index 35de1a727f..63a6bf9343 100644 --- a/shared/nm-keyfile/nm-keyfile.c +++ b/shared/nm-keyfile/nm-keyfile.c @@ -3534,7 +3534,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); |