From e82314b1bf75ee7240e70a8e97aac8dccbe5d061 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 26 Sep 2017 22:41:47 -0400 Subject: [PATCH] vtysh: remove extra / in config path before: frrdev# do wr Note: this version of vtysh never writes vtysh.conf Building Configuration... Integrated configuration saved to /etc/frr//frr.conf [OK] frrdev# after: frrdev# do wr Note: this version of vtysh never writes vtysh.conf Building Configuration... Integrated configuration saved to /etc/frr/frr.conf [OK] frrdev# Signed-off-by: Quentin Young --- vtysh/vtysh_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index 003853571f..99c05ef79b 100644 --- a/vtysh/vtysh_main.c +++ b/vtysh/vtysh_main.c @@ -404,9 +404,9 @@ int main(int argc, char **argv, char **env) "NOT SUPPORTED since its\nresults are inconsistent!\n"); } - snprintf(vtysh_config, sizeof(vtysh_config), "%s%s/%s", sysconfdir, + snprintf(vtysh_config, sizeof(vtysh_config), "%s%s%s", sysconfdir, pathspace, VTYSH_CONFIG_NAME); - snprintf(frr_config, sizeof(frr_config), "%s%s/%s", sysconfdir, + snprintf(frr_config, sizeof(frr_config), "%s%s%s", sysconfdir, pathspace, FRR_CONFIG_NAME); strlcat(vtydir, pathspace, sizeof(vtydir)); -- 2.39.5