From d3db846d95b11d75eb8bba45f503a888ac26233f Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 28 May 2018 18:13:42 +0200 Subject: ifcfg-rh: add missing NM-only annotations Add the (+) annotation to NM-only variables. --- libnm-core/nm-setting-ip4-config.c | 2 +- libnm-core/nm-setting-ip6-config.c | 2 +- libnm-core/nm-setting-tc-config.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index c7d80a9fdc..a88a3f2b9c 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -746,7 +746,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class) /* ---ifcfg-rh--- * property: dad-timeout - * variable: ACD_TIMEOUT, ARPING_WAIT + * variable: ACD_TIMEOUT(+), ARPING_WAIT * default: missing variable means global default (config override or zero) * description: Timeout (in milliseconds for ACD_TIMEOUT or in seconds * for ARPING_WAIT) for address conflict detection before configuring diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index d483d1921a..76a68aa085 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -589,7 +589,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) /* ---ifcfg-rh--- * property: dns-search - * variable: IPV6_DOMAIN + * variable: IPV6_DOMAIN(+) * format: string (space-separated domains) * description: List of DNS search domains. * ---end--- diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c index b05bb38ebb..41db056794 100644 --- a/libnm-core/nm-setting-tc-config.c +++ b/libnm-core/nm-setting-tc-config.c @@ -1610,7 +1610,7 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *setting_class) **/ /* ---ifcfg-rh--- * property: qdiscs - * variable: QDISC1, QDISC2, ... + * variable: QDISC1(+), QDISC2(+), ... * description: Queueing disciplines * example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel" * ---end--- @@ -1637,7 +1637,7 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *setting_class) **/ /* ---ifcfg-rh--- * property: qdiscs - * variable: FILTER1, FILTER2, ... + * variable: FILTER1(+), FILTER2(+), ... * description: Traffic filters * example: FILTER1="parent ffff: matchall action simple sdata Input", ... * ---end--- -- cgit v1.2.1