From e82314b1bf75ee7240e70a8e97aac8dccbe5d061 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 26 Sep 2017 22:41:47 -0400 Subject: [PATCH 1/2] 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)); From 3607783335d4a653bbeb99d1597e0297de096342 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Fri, 29 Sep 2017 11:26:11 -0400 Subject: [PATCH 2/2] lib: remove extra / in other paths Non-integrated config paths need the treatment as well. Signed-off-by: Quentin Young --- lib/libfrr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index 3e2e008223..307d9c2e38 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -534,7 +534,7 @@ struct thread_master *frr_init(void) snprintf(p_pathspace, sizeof(p_pathspace), "/%s", di->pathspace); - snprintf(config_default, sizeof(config_default), "%s%s/%s%s.conf", + snprintf(config_default, sizeof(config_default), "%s%s%s%s.conf", frr_sysconfdir, p_pathspace, di->name, p_instance); snprintf(pidfile_default, sizeof(pidfile_default), "%s%s/%s%s.pid", frr_vtydir, p_pathspace, di->name, p_instance);