diff options
author | MartÃn Beauchamp <martinb@shapeways.com> | 2017-02-27 19:26:20 +0100 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-09 15:45:00 +0100 |
commit | 685e701ef39b206b8dc6bcc6672b4de4ae09b049 (patch) | |
tree | c0c5f6d178b9222cd25430a944e2c41138d65673 /vtysh | |
parent | zebra: Notify all nexthops that we've changed (diff) | |
download | frr-685e701ef39b206b8dc6bcc6672b4de4ae09b049.tar.xz frr-685e701ef39b206b8dc6bcc6672b4de4ae09b049.zip |
Lowercase frr.conf
Diffstat (limited to 'vtysh')
-rw-r--r-- | vtysh/vtysh.c | 2 | ||||
-rw-r--r-- | vtysh/vtysh.h | 2 | ||||
-rw-r--r-- | vtysh/vtysh_main.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 48f608b8b..51f71a46b 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 Frr.conf explicitely set. */ + /* If integrated frr.conf explicitely set. */ if (want_config_integrated()) { ret = CMD_WARNING; diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index 39bf64f30..ad31195ac 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 FRR_DEFAULT_CONFIG "Frr.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 49aedae32..8b58f740a 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -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 (Frr.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 Frr.conf + * Overwrite location for frr.conf */ vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/'); if (vtysh_configfile_name) |