diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-05-26 22:45:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-05-27 09:45:23 +0200 |
| commit | e9f2831ab54381d6ed1fa5bc17cd6a90694a33c4 (patch) | |
| tree | 246370430800c31ae94141b17373945bfa399058 | |
| parent | 321311ff7d5725452b79a2240bf62e1188b407c0 (diff) | |
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')
(cherry picked from commit 82a468c9ad40ba18281beabea6f9c627fe3e881d)
(cherry picked from commit d6116479978e7d74ff5131d66611776fd8fc0158)
| -rw-r--r-- | libnm-core/nm-keyfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c index 57db781aa4..d0ec984e2d 100644 --- a/libnm-core/nm-keyfile.c +++ b/libnm-core/nm-keyfile.c @@ -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); |