diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-02-03 12:11:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 12:11:18 -0800 |
| commit | 1b4ae82d37fe06a9e6a7cac6a67aa5fb3beb777c (patch) | |
| tree | 8e08fb25ecc2eaac67e32547883078558d28221f | |
| parent | 0b6f595a693f1eafe9418bfa5e4406d03b2acd94 (diff) | |
| parent | a0b4b67e80d41f013267b86dad632b5f6114f7e8 (diff) | |
Merge pull request #167 from qlyoung/vtysh-subs-stable
vtysh: Quagga.conf -> Frr.conf
| -rw-r--r-- | vtysh/vtysh.h | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index 537f944a7a..39bf64f307 100644 --- 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 78b17be058..127cb70ad5 100644 --- 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, |