vtysh: infer integrated config usage from existence of Quagga.conf

[mirror_frr.git] / vtysh / vtysh_config.c

diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index eb58497310b639b29634ccb003350eca371f6a20..4b0a39084338842467ba9611c196973421c03b10 100644 (file)
--- 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 ();
 }