diff options
| author | Christian Franke <nobody@nowhere.ws> | 2016-09-26 22:01:37 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-10-12 07:42:25 -0400 |
| commit | 039eaca36717fb9bfe415cc47b4d36848c54b51f (patch) | |
| tree | 161fac0b6f69c4d325311cafd33b7b9082e0dede /vtysh/vtysh_config.c | |
| parent | b6bf1505df0d8fa7d566126e6ea2aa9b9f9c8f54 (diff) | |
vtysh: infer integrated config usage from existence of Quagga.conf
Only write to integrated config if integrated config is configured
explicitly or it is already in use.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'vtysh/vtysh_config.c')
| -rw-r--r-- | vtysh/vtysh_config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index eb58497310..4b0a390843 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -33,8 +33,6 @@ DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CONFIG_LINE, "Vtysh configuration line") vector configvec; -extern int vtysh_writeconfig_integrated; - struct config { /* Configuration node name. */ @@ -458,8 +456,10 @@ vtysh_config_write () sprintf (line, "hostname %s", host.name); vtysh_config_parse_line(line); } - if (!vtysh_writeconfig_integrated) + if (vtysh_write_integrated == WRITE_INTEGRATED_NO) vtysh_config_parse_line ("no service integrated-vtysh-config"); + if (vtysh_write_integrated == WRITE_INTEGRATED_YES) + vtysh_config_parse_line ("service integrated-vtysh-config"); user_config_write (); } |