diff options
| -rw-r--r-- | bgpd/bgp_vty.c | 2 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 4 | ||||
| -rw-r--r-- | cumulus/etc/quagga/Quagga.conf | 1 | ||||
| -rw-r--r-- | vtysh/vtysh_main.c | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 4b1174b16..bb074dc02 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -13600,7 +13600,7 @@ bgp_show_peer_group (struct vty *vty, struct bgp *bgp, } if (type == show_peer_group && ! find) - vty_out (vty, "%% No such peer-groupr%s", VTY_NEWLINE); + vty_out (vty, "%% No such peer-group%s", VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index b3721a03e..71ccf7c90 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6727,7 +6727,9 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, { if (bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4)) { - vty_out (vty, " neighbor %s activate%s", addr, VTY_NEWLINE); + afi_header_vty_out(vty, afi, safi, write, + " neighbor %s activate%s", + addr, VTY_NEWLINE); } } else diff --git a/cumulus/etc/quagga/Quagga.conf b/cumulus/etc/quagga/Quagga.conf index a0b3ee0cf..e52f3f8aa 100644 --- a/cumulus/etc/quagga/Quagga.conf +++ b/cumulus/etc/quagga/Quagga.conf @@ -1,3 +1,2 @@ log file /var/log/quagga/quagga.log log timestamp precision 6 - diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 5bb3c61e5..3c46194d3 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -415,7 +415,10 @@ main (int argc, char **argv, char **env) if (vtysh_connect_all (daemon_name) <= 0) { fprintf(stderr, "Exiting: failed to connect to any daemons.\n"); - exit(1); + if (no_error) + exit(0); + else + exit(1); } if (inputfile) |