diff options
| author | Dinesh Dutt <dd.ps4u@gmail.com> | 2019-05-08 03:00:34 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-05-08 03:06:00 +0200 |
| commit | dc1c13c019523928b49a2caa32d87762ee2d4e08 (patch) | |
| tree | 77662bd6ecad39222a250e891a25d0c2ca034c8e /vtysh | |
| parent | Merge pull request #4280 from qlyoung/remove-yang-strreplace-func (diff) | |
| download | frr-dc1c13c019523928b49a2caa32d87762ee2d4e08.tar.xz frr-dc1c13c019523928b49a2caa32d87762ee2d4e08.zip | |
lib, vtysh: Make archaic "terminal" optional in configure command
The 'configure terminal' command is a bit redundant, so make
the terminal portion optional.
Signed-off-by: Dinesh Dutt <dd.ps4u@gmail.com>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index eff1e996e..24effa704 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -502,7 +502,7 @@ static int vtysh_execute_func(const char *line, int pager) vtysh_execute("exit"); } else if (tried) { vtysh_execute("end"); - vtysh_execute("configure terminal"); + vtysh_execute("configure"); } } /* @@ -540,7 +540,7 @@ static int vtysh_execute_func(const char *line, int pager) if (pager && strncmp(line, "exit", 4)) vty_open_pager(vty); - if (!strcmp(cmd->string, "configure terminal")) { + if (!strcmp(cmd->string, "configure")) { for (i = 0; i < array_size(vtysh_client); i++) { cmd_stat = vtysh_client_execute( &vtysh_client[i], line); @@ -674,7 +674,7 @@ int vtysh_mark_file(const char *filename) vty->node = CONFIG_NODE; vtysh_execute_no_pager("enable"); - vtysh_execute_no_pager("configure terminal"); + vtysh_execute_no_pager("configure"); vty_buf_copy = XCALLOC(MTYPE_VTYSH_CMD, VTY_BUFSIZ); while (fgets(vty->buf, VTY_BUFSIZ, confp)) { @@ -1744,7 +1744,7 @@ DEFUNSH(VTYSH_REALLYALL, vtysh_disable, vtysh_disable_cmd, "disable", } DEFUNSH(VTYSH_REALLYALL, vtysh_config_terminal, vtysh_config_terminal_cmd, - "configure terminal", + "configure [terminal]", "Configuration from vty interface\n" "Configuration terminal\n") { @@ -1786,7 +1786,7 @@ static int vtysh_exit(struct vty *vty) case BFD_NODE: case RPKI_NODE: vtysh_execute("end"); - vtysh_execute("configure terminal"); + vtysh_execute("configure"); vty->node = CONFIG_NODE; break; case BGP_VPNV4_NODE: |