From 97cfc10a341584ba1c582449c688a0f7962d2aaf Mon Sep 17 00:00:00 2001 From: Karel Van Hecke <25814162+karelvanhecke@users.noreply.github.com> Date: Wed, 17 Nov 2021 11:06:23 +0100 Subject: [PATCH 1/2] redhat: check if frr.conf already exists Signed-off-by: Karel Van Hecke <25814162+karelvanhecke@users.noreply.github.com> --- redhat/frr.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 229104baff..04a3258980 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -564,7 +564,7 @@ zebra_spec_add_service fabricd 2618/tcp "Fabricd vty" /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir # Create dummy config file if they don't exist so basic functions can be used. -if [ ! -e %{configdir}/zebra.conf ]; then +if [ ! -e %{configdir}/frr.conf ]; then # per daemon configs exist mv %{configdir}/frr.conf.template %{configdir}/frr.conf %if 0%{?frr_user:1} From bc6ea7ae8e93e7533c8143761e1018f005464f5b Mon Sep 17 00:00:00 2001 From: Karel Van Hecke <25814162+karelvanhecke@users.noreply.github.com> Date: Wed, 17 Nov 2021 11:35:23 +0100 Subject: [PATCH 2/2] redhat: keep check for zebra.conf to check for per daemon configs Signed-off-by: Karel Van Hecke <25814162+karelvanhecke@users.noreply.github.com> --- redhat/frr.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 04a3258980..7f8e89de16 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -564,8 +564,8 @@ zebra_spec_add_service fabricd 2618/tcp "Fabricd vty" /sbin/install-info %{_infodir}/frr.info.gz %{_infodir}/dir # Create dummy config file if they don't exist so basic functions can be used. -if [ ! -e %{configdir}/frr.conf ]; then - # per daemon configs exist +if [ ! -e %{configdir}/frr.conf ] && [ ! -e %{configdir}/zebra.conf ]; then + # No frr.conf and per daemon configs exist mv %{configdir}/frr.conf.template %{configdir}/frr.conf %if 0%{?frr_user:1} chown %{frr_user}:%{frr_user} %{configdir}/frr.conf