vtysh: Quagga.conf -> Frr.conf

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index 537f944a7a0451f3c9e666c2233a866089144c17..39bf64f307ecd3275f15e25cc9f1273c46bbe9d4 100644 (file)
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -49,7 +49,7 @@ DECLARE_MGROUP(MVTYSH)
 
 /* vtysh local configuration file. */
 #define VTYSH_DEFAULT_CONFIG "vtysh.conf"
-#define QUAGGA_DEFAULT_CONFIG "Quagga.conf"
+#define FRR_DEFAULT_CONFIG "Frr.conf"
 
 enum vtysh_write_integrated {
        WRITE_INTEGRATED_UNSPECIFIED,

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 78b17be0581e227091ff0d4c43bfeca162bb8b8c..127cb70ad507d61f4a19b373c4bbc932c363cf51 100644 (file)
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -46,7 +46,7 @@ char *progname;
 
 /* Configuration file name and directory. */
 static char vtysh_config_always[MAXPATHLEN] = SYSCONFDIR VTYSH_DEFAULT_CONFIG;
-static char quagga_config_default[MAXPATHLEN] = SYSCONFDIR QUAGGA_DEFAULT_CONFIG;
+static char quagga_config_default[MAXPATHLEN] = SYSCONFDIR FRR_DEFAULT_CONFIG;
 char *quagga_config = quagga_config_default;
 char history_file[MAXPATHLEN];
 
@@ -357,17 +357,17 @@ main (int argc, char **argv, char **env)
          /* 
           * Overwrite location for Quagga.conf
           */
-         vtysh_configfile_name = strrchr(QUAGGA_DEFAULT_CONFIG, '/');
+         vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/');
          if (vtysh_configfile_name)
            /* skip '/' */
            vtysh_configfile_name++;
          else
            /*
-            * QUAGGA_DEFAULT_CONFIG configured with relative path
+            * FRR_DEFAULT_CONFIG configured with relative path
             * during config? Should really never happen for
             * sensible config
             */
-           vtysh_configfile_name = (char *) QUAGGA_DEFAULT_CONFIG;
+           vtysh_configfile_name = (char *) FRR_DEFAULT_CONFIG;
          strlcpy(quagga_config_default, optarg, sizeof(vtysh_config_always));
          strlcat(quagga_config_default, "/", sizeof(vtysh_config_always));
          strlcat(quagga_config_default, vtysh_configfile_name,