diff options
| -rw-r--r-- | lib/vty.h | 2 | ||||
| -rwxr-xr-x | tools/frr-reload.py | 4 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 6 |
4 files changed, 7 insertions, 7 deletions
@@ -198,7 +198,7 @@ struct vty_arg }; /* Integrated configuration file. */ -#define INTEGRATE_DEFAULT_CONFIG "Quagga.conf" +#define INTEGRATE_DEFAULT_CONFIG "Frr.conf" /* Small macro to determine newline is newline only or linefeed needed. */ #define VTY_NEWLINE ((vty->type == VTY_TERM) ? "\r\n" : "\n") diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 1cad55ac34..2dbc60d1f4 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -859,7 +859,7 @@ if __name__ == '__main__': parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False) parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False) parser.add_argument('filename', help='Location of new frr config file') - parser.add_argument('--overwrite', action='store_true', help='Overwrite Quagga.conf with running config output', default=False) + parser.add_argument('--overwrite', action='store_true', help='Overwrite Frr.conf with running config output', default=False) args = parser.parse_args() # Logging @@ -1068,5 +1068,5 @@ if __name__ == '__main__': os.unlink(filename) # Make these changes persistent - if args.overwrite or args.filename != '/etc/quagga/Quagga.conf': + if args.overwrite or args.filename != '/etc/frr/Frr.conf': subprocess.call(['/usr/bin/vtysh', '-c', 'write']) 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) |