diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 13:44:09 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-07 13:44:09 -0500 |
| commit | 0dca233ec09c61b25ccb0cf3181c8f2e85e687e6 (patch) | |
| tree | 4e2c809621731c491f9bde413b42aed3c81e0045 /vtysh | |
| parent | 2cfe3d285ff001046b579434dea5f963082630dd (diff) | |
*: Found some instances of Quagga.conf
Cleanup Quagga.conf -> Frr.conf
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 6f9273e889..7546b4ddb0 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2636,7 +2636,7 @@ DEFUN (vtysh_write_memory, fprintf (stdout, "Note: this version of vtysh never writes vtysh.conf\n"); - /* If integrated Quagga.conf explicitely set. */ + /* If integrated Frr.conf explicitely set. */ if (want_config_integrated()) { ret = CMD_WARNING; diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 127cb70ad5..49aedae322 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -140,7 +140,7 @@ usage (int status) fprintf (stderr, "Try `%s --help' for more information.\n", progname); else printf ("Usage : %s [OPTION...]\n\n" \ - "Integrated shell for Quagga routing software suite. \n\n" \ + "Integrated shell for FRR. \n\n" \ "-b, --boot Execute boot startup configuration\n" \ "-c, --command Execute argument as command\n" \ "-d, --daemon Connect only to the specified daemon\n" \ @@ -151,7 +151,7 @@ usage (int status) "-m, --markfile Mark input file with context end\n" \ " --vty_socket Override vty socket path\n" \ " --config_dir Override config directory path\n" \ - "-w, --writeconfig Write integrated config (Quagga.conf) and exit\n" \ + "-w, --writeconfig Write integrated config (Frr.conf) and exit\n" \ "-h, --help Display this help and exit\n\n" \ "Note that multiple commands may be executed from the command\n" \ "line by passing multiple -c args, or by embedding linefeed\n" \ @@ -355,7 +355,7 @@ main (int argc, char **argv, char **env) strlcat(vtysh_config_always, vtysh_configfile_name, sizeof(vtysh_config_always)); /* - * Overwrite location for Quagga.conf + * Overwrite location for Frr.conf */ vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/'); if (vtysh_configfile_name) |