From 766b1df94f3679522a8441a3fdd9e7e5bf77c62c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 19 2021 06:10:07 +0000
Subject: import frr-7.5-4.el8


---

diff --git a/SOURCES/0007-frrinit.patch b/SOURCES/0007-frrinit.patch
new file mode 100644
index 0000000..f5fd13c
--- /dev/null
+++ b/SOURCES/0007-frrinit.patch
@@ -0,0 +1,31 @@
+diff --git a/tools/frrinit.sh.in b/tools/frrinit.sh.in
+index 539ab7d..d27d1be 100644
+--- a/tools/frrinit.sh.in
++++ b/tools/frrinit.sh.in
+@@ -43,7 +43,7 @@ fi
+ case "$1" in
+ start)
+ 	daemon_list daemons
+-	watchfrr_options="$watchfrr_options $daemons"
++	watchfrr_options="$daemons"
+ 	daemon_start watchfrr
+ 	;;
+ stop)
+@@ -57,7 +57,7 @@ restart|force-reload)
+ 	all_stop --reallyall
+ 
+ 	daemon_list daemons
+-	watchfrr_options="$watchfrr_options $daemons"
++	watchfrr_options="$daemons"
+ 	daemon_start watchfrr
+ 	;;
+ 
+@@ -87,7 +87,7 @@ reload)
+ 	# restart watchfrr to pick up added daemons.
+ 	# NB: This will NOT cause the other daemons to be restarted.
+ 	daemon_list daemons
+-	watchfrr_options="$watchfrr_options $daemons"
++	watchfrr_options="$daemons"
+ 	daemon_stop watchfrr && \
+ 		daemon_start watchfrr
+ 
diff --git a/SPECS/frr.spec b/SPECS/frr.spec
index ad6291c..6445ed2 100644
--- a/SPECS/frr.spec
+++ b/SPECS/frr.spec
@@ -5,7 +5,7 @@
 
 Name: frr
 Version: 7.5
-Release: 2%{?checkout}%{?dist}
+Release: 4%{?checkout}%{?dist}
 Summary: Routing daemon
 License: GPLv2+
 URL: http://www.frrouting.org
@@ -36,6 +36,7 @@ Patch0002: 0002-enable-openssl.patch
 Patch0003: 0003-disable-eigrp-crypto.patch
 Patch0004: 0004-fips-mode.patch
 Patch0006: 0006-CVE-2020-12831.patch
+Patch0007: 0007-frrinit.patch
 
 %description
 FRRouting is free software that manages TCP/IP based routing protocols. It takes
@@ -128,10 +129,23 @@ if [ -f %{_infodir}/%{name}.inf* ]; then
 fi
 
 # Create dummy files if they don't exist so basic functions can be used.
-if [ ! -e %{_sysconfdir}/frr/frr.conf ]; then
-    echo "hostname `hostname`" > %{_sysconfdir}/frr/frr.conf
-    chown frr:frr %{_sysconfdir}/frr/frr.conf
-    chmod 640 %{_sysconfdir}/frr/frr.conf
+if [ ! -e %{_sysconfdir}/frr/zebra.conf ]; then
+    echo "hostname `hostname`" > %{_sysconfdir}/frr/zebra.conf
+    chown frr:frr %{_sysconfdir}/frr/zebra.conf
+    chmod 640 %{_sysconfdir}/frr/zebra.conf
+fi
+
+if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then
+    echo 'no service integrated-vtysh-config' > %{_sysconfdir}/frr/vtysh.conf
+    chmod 640 %{_sysconfdir}/frr/vtysh.conf
+    chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
+fi
+
+#Making sure that the old format of config file still works
+#Checking whether .rpmnew conf file is present - in that case I want to change the old config
+if [ -e %{_sysconfdir}/frr/daemons.rpmnew ]; then
+    sed -i s'/watchfrr_/#watchfrr_/g' %{_sysconfdir}/frr/daemons
+    sed -i s'/zebra=/#zebra=/g' %{_sysconfdir}/frr/daemons
 fi
 
 %postun
@@ -162,7 +176,7 @@ make check PYTHON=%{__python3}
 %doc ripngd/ripngd.conf.sample
 %doc pimd/pimd.conf.sample
 %doc doc/mpls
-%dir %attr(640,frr,frr) %{_sysconfdir}/frr
+%dir %attr(740,frr,frr) %{_sysconfdir}/frr
 %dir %attr(755,frr,frr) /var/log/frr
 %dir %attr(755,frr,frr) /run/frr
 %{_infodir}/*info*
@@ -183,6 +197,12 @@ make check PYTHON=%{__python3}
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Tue Jan 12 2021 root - 7.5-4
+- Related: #1889323 - Fixing start-up with old config file
+
+* Mon Jan 11 2021 root - 7.5-3
+- Related: #1889323 - Reverting to non-integrated cofiguration
+
 * Thu Jan 07 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-2
 - Related: #1889323 - Obsoleting frr-contrib