From 2d02711f6213a5e8959059a964dc712b986f3d48 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 4 Sep 2017 21:13:17 +0200 Subject: [PATCH 1/5] man: remove unused xsl variable --- man/nm-settings-ifcfg-rh.xsl | 1 - 1 file changed, 1 deletion(-) diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index 0dc5394ee6..f732f4940d 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -17,7 +17,6 @@ /> - nm-settings-ifcfg-rh From c2ac7e52c5e8d00e829616033fda9c042253d4e5 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 4 Sep 2017 21:13:54 +0200 Subject: [PATCH 2/5] man: add unsupported ifcfg-rh settings Add macsec and dummy setting to the unsupported list. While at it, also sort entries. --- man/nm-settings-ifcfg-rh.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index f732f4940d..b1ea0a069b 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -327,7 +327,7 @@ DEVICETYPE=TeamPort - + <xsl:value-of select="@name"/> setting From 176c3cc30a18606a19e4159c6d6216ed9932031b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 4 Sep 2017 21:15:44 +0200 Subject: [PATCH 3/5] man: fix evaluation of unsupported ifcfg-rh settings The 'contains' function has no notion of separators, so 'vlan' can match 'macvlan' in the unspported list. Add separator to avoid matching substrings. --- man/nm-settings-ifcfg-rh.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl index b1ea0a069b..aef30fd104 100644 --- a/man/nm-settings-ifcfg-rh.xsl +++ b/man/nm-settings-ifcfg-rh.xsl @@ -328,7 +328,7 @@ DEVICETYPE=TeamPort - +
<xsl:value-of select="@name"/> setting From 20bb9bde243a676607855fcfb6edd7130815c0d6 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 5 Sep 2017 08:58:33 +0200 Subject: [PATCH 4/5] libnm/generate-plugin-docs: ignore files without a setting name If no setting name is found in the file, it means that the file possibly contains a setting superclass (e.g. NMSettingIPConfig) without any property definition; just ignore it. --- libnm/generate-plugin-docs.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libnm/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl index 405c6e1164..24912a0372 100755 --- a/libnm/generate-plugin-docs.pl +++ b/libnm/generate-plugin-docs.pl @@ -75,9 +75,11 @@ write_header(); foreach my $c_file (@source_files) { my $path = "$srcdir/$c_file"; my $setting_name = get_setting_name($path); - write_item(""); - scan_doc_comments($path, $start_tag, $end_tag); - write_item(""); + if ($setting_name) { + write_item(""); + scan_doc_comments($path, $start_tag, $end_tag); + write_item(""); + } } # write XML footer From ade90756ba364169e798109461c3755dbf7addb2 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 5 Sep 2017 09:24:29 +0200 Subject: [PATCH 5/5] libnm-core: add ifcfg-rh documentation for user setting --- libnm-core/nm-setting-user.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c index 6c1d152aa9..049607e146 100644 --- a/libnm-core/nm-setting-user.c +++ b/libnm-core/nm-setting-user.c @@ -597,6 +597,18 @@ nm_setting_user_class_init (NMSettingUserClass *klass) * * Since: 1.8 **/ + /* ---ifcfg-rh--- + * property: data + * variable: NM_USER_* + * description: each key/value pair is stored as a separate variable with + * name composed by concatenating NM_USER_ with the encoded key. The key is + * encoded by substituting lowercase letters with uppercase and prepending + * uppercase letters with an underscore. A dot is encoded as a double + * underscore. Remaining characters are encoded as underscore followed by a + * 3 digit octal representation of the character. + * example: NM_USER_FOO__BAR=something + * ---end--- + */ obj_properties[PROP_DATA] = g_param_spec_boxed (NM_SETTING_USER_DATA, "", "", G_TYPE_HASH_TABLE,