diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-01 13:59:06 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-02 15:50:04 +0200 |
| commit | a1ea678f7801188f3a1850a319dcc249a4c3bd37 (patch) | |
| tree | b03646bed906583d7136dc4160fe90f4f437bec3 /src/nm-config.h | |
| parent | bd57d76af863f2e3ac314084b331b37797a072d2 (diff) | |
| download | NetworkManager-a1ea678f7801188f3a1850a319dcc249a4c3bd37.tar.gz | |
config: only handle 'option+' and 'option-' keys for known settings
It is wrong to blindly merge keys that have an 'option+' or 'option-'.
Merging options is only possibly when we understand what the option
means and how to merge it.
No longer handle every setting but only those that are explicitly known
to be string-lists (or device-specs).
Diffstat (limited to 'src/nm-config.h')
| -rw-r--r-- | src/nm-config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nm-config.h b/src/nm-config.h index 20dbab388f..5b096f165d 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -49,6 +49,7 @@ G_BEGIN_DECLS #define NM_CONFIG_KEYFILE_LIST_SEPARATOR ',' #define NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION "connection" +#define NM_CONFIG_KEYFILE_GROUPPREFIX_TEST_APPEND_STRINGLIST ".test-append-stringlist" #define NM_CONFIG_KEYFILE_GROUP_MAIN "main" #define NM_CONFIG_KEYFILE_GROUP_LOGGING "logging" |