diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-08-15 13:43:50 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-08-15 13:43:50 +0200 |
| commit | a23587faac3c1f463c45e02ef7f6607eb3da6297 (patch) | |
| tree | 8e7fdcb4f32a7d02b8e35f8c5d2e72801062f706 | |
| parent | e2799b1d676022a00daf3e863ce494e33bbb1737 (diff) | |
vtysh: don't collect config from watchfrr
This results in some hardcoded watchfrr logging config ending up in the
integrated config otherwise.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | vtysh/vtysh.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 6255726c47..f971c171bc 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -250,6 +250,13 @@ static int vtysh_client_execute(struct vtysh_client *head_client, static void vtysh_client_config(struct vtysh_client *head_client, char *line) { + /* watchfrr currently doesn't load any config, and has some hardcoded + * settings that show up in "show run". skip it here (for now at + * least) so we don't get that mangled up in config-write. + */ + if (head_client->flag == VTYSH_WATCHFRR) + return; + vtysh_client_run_all(head_client, line, 1, NULL, vtysh_config_parse_line, NULL); } |