You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
2.7 KiB
64 lines
2.7 KiB
From 97d153d9e34916b386bc6ef5d824859328acb569 Mon Sep 17 00:00:00 2001 |
|
From: Francesco Giudici <fgiudici@redhat.com> |
|
Date: Fri, 19 Jan 2018 19:27:44 +0100 |
|
Subject: [PATCH 1/2] nmcli: clear link-watchers before adding the new ones we |
|
want to set |
|
|
|
(cherry picked from commit ff16252a71306716677885d8de1ece140407f551) |
|
--- |
|
clients/common/nm-meta-setting-desc.c | 2 ++ |
|
1 file changed, 2 insertions(+) |
|
|
|
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c |
|
index d4f162fb4..53d8350d7 100644 |
|
--- a/clients/common/nm-meta-setting-desc.c |
|
+++ b/clients/common/nm-meta-setting-desc.c |
|
@@ -4038,6 +4038,7 @@ _set_fcn_team_link_watchers (ARGS_SET_FCN) |
|
const char *const*iter; |
|
NMTeamLinkWatcher *watcher; |
|
|
|
+ nm_setting_team_clear_link_watchers (NM_SETTING_TEAM (setting)); |
|
strv = nmc_strsplit_set (value, ",", 0); |
|
for (iter = (const char *const*) strv; *iter; iter++) { |
|
watcher = _parse_team_link_watcher (*iter, error); |
|
@@ -4110,6 +4111,7 @@ _set_fcn_team_port_link_watchers (ARGS_SET_FCN) |
|
const char *const*iter; |
|
NMTeamLinkWatcher *watcher; |
|
|
|
+ nm_setting_team_port_clear_link_watchers (NM_SETTING_TEAM_PORT (setting)); |
|
strv = nmc_strsplit_set (value, ",", 0); |
|
for (iter = (const char *const*) strv; *iter; iter++) { |
|
watcher = _parse_team_link_watcher (*iter, error); |
|
-- |
|
2.14.3 |
|
|
|
|
|
From 4f76b01f10397dd84c5a6a75ea53cf89592e341d Mon Sep 17 00:00:00 2001 |
|
From: Francesco Giudici <fgiudici@redhat.com> |
|
Date: Fri, 19 Jan 2018 19:53:10 +0100 |
|
Subject: [PATCH 2/2] doc: fix describe message for team link watchers |
|
|
|
(cherry picked from commit d7f3c79881f0c4db5e14f7cce01b90ef63cacb4f) |
|
--- |
|
clients/common/nm-meta-setting-desc.c | 4 ++-- |
|
1 file changed, 2 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c |
|
index 53d8350d7..46b06fd40 100644 |
|
--- a/clients/common/nm-meta-setting-desc.c |
|
+++ b/clients/common/nm-meta-setting-desc.c |
|
@@ -4959,10 +4959,10 @@ static const NMMetaPropertyType _pt_gobject_devices = { |
|
"Properties available for the 'nsna_ping' link watcher:\n" \ |
|
" 'init-wait', 'interval', 'missed-max', 'target-host'*\n\n" \ |
|
"Properties available for the 'arp_ping' include all the ones for 'nsna_ping' and:\n" \ |
|
- " 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n\n" \ |
|
+ " 'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n\n" \ |
|
"Properties flagged with a '*' are mandatory.\n\n" \ |
|
"Example:\n" \ |
|
- " name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; name=ethtool,delay-up=3\n") |
|
+ " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n") |
|
|
|
|
|
#define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \ |
|
-- |
|
2.14.3
|
|
|