New patch and improvments for: https://github.com/FRRouting/frr/issues/4261

1 files changed, 58 insertions, 53 deletions

diff --git a/frr_7.0_Archlinux.patch b/frr_7.0_Archlinux.patch
index a48af7998bf2..fa96bc7bbd31 100644
--- a/frr_7.0_Archlinux.patch
+++ b/frr_7.0_Archlinux.patch
@@ -1,59 +1,64 @@
-diff -Naupr frr-frr-7.0_orig/redhat/daemons frr-frr-7.0/redhat/daemons
---- frr-frr-7.0_orig/redhat/daemons	2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/redhat/daemons	2019-04-29 13:42:01.157161004 +0700
-@@ -35,7 +35,7 @@
- # group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
- #
- watchfrr_enable=yes
--watchfrr_options="-r '/usr/lib/frr/frr restart %s' -s '/usr/lib/frr/frr start %s' -k '/usr/lib/frr/frr stop %s'"
-+watchfrr_options="-d -r '/usr/bin/frr restart %s' -s '/usr/bin/frr start %s' -k '/usr/bin/frr stop %s'"
- #
- zebra=no
- bgpd=no
-@@ -58,23 +58,23 @@ fabricd=no
+diff -Naupr frr-frr-7.0_orig/tools/etc/frr/daemons frr-frr-7.0/tools/etc/frr/daemons
+--- frr-frr-7.0_orig/tools/etc/frr/daemons	2019-03-01 06:32:04.000000000 +0700
++++ frr-frr-7.0/tools/etc/frr/daemons	2019-05-10 14:52:18.395888041 +0700
+@@ -29,6 +29,8 @@ sharpd=no
+ pbrd=no
+ bfdd=no
+ fabricd=no
++zebra=yes
++#ospfd_instances="1,2,3"
+ 
  #
- # Command line options for the daemons
+ # If this option is set the /etc/init.d/frr script automatically loads
+@@ -36,26 +38,27 @@ fabricd=no
+ # Check /etc/pam.d/frr if you intend to use "vtysh"!
  #
--zebra_options=("-A 127.0.0.1")
--bgpd_options=("-A 127.0.0.1")
--ospfd_options=("-A 127.0.0.1")
--ospf6d_options=("-A ::1")
--ripd_options=("-A 127.0.0.1")
--ripngd_options=("-A ::1")
--isisd_options=("-A 127.0.0.1")
--ldpd_options=("-A 127.0.0.1")
--pimd_options=("-A 127.0.0.1")
--nhrpd_options=("-A 127.0.0.1")
--eigrpd_options=("-A 127.0.0.1")
--babeld_options=("-A 127.0.0.1")
--sharpd_options=("-A 127.0.0.1")
--pbrd_options=("-A 127.0.0.1")
--staticd_options=("-A 127.0.0.1")
--bfdd_options=("-A 127.0.0.1")
--fabricd_options=("-A 127.0.0.1")
-+zebra_options=("-A 127.0.0.1 -d")
-+bgpd_options=("-A 127.0.0.1 -d")
-+ospfd_options=("-A 127.0.0.1 -d")
-+ospf6d_options=("-A ::1 -d")
-+ripd_options=("-A 127.0.0.1 -d")
-+ripngd_options=("-A ::1 -d")
-+isisd_options=("-A 127.0.0.1 -d")
-+ldpd_options=("-A 127.0.0.1 -d")
-+pimd_options=("-A 127.0.0.1 -d")
-+nhrpd_options=("-A 127.0.0.1 -d")
-+eigrpd_options=("-A 127.0.0.1 -d")
-+babeld_options=("-A 127.0.0.1 -d")
-+sharpd_options=("-A 127.0.0.1 -d")
-+pbrd_options=("-A 127.0.0.1 -d")
-+staticd_options=("-A 127.0.0.1 -d")
-+bfdd_options=("-A 127.0.0.1 -d")
-+fabricd_options=("-A 127.0.0.1 -d")
+ vtysh_enable=yes
+-zebra_options="  -A 127.0.0.1 -s 90000000"
+-bgpd_options="   -A 127.0.0.1"
+-ospfd_options="  -A 127.0.0.1"
+-ospf6d_options=" -A ::1"
+-ripd_options="   -A 127.0.0.1"
+-ripngd_options=" -A ::1"
+-isisd_options="  -A 127.0.0.1"
+-pimd_options="   -A 127.0.0.1"
+-ldpd_options="   -A 127.0.0.1"
+-nhrpd_options="  -A 127.0.0.1"
+-eigrpd_options=" -A 127.0.0.1"
+-babeld_options=" -A 127.0.0.1"
+-sharpd_options=" -A 127.0.0.1"
+-pbrd_options="   -A 127.0.0.1"
+-staticd_options="-A 127.0.0.1"
+-bfdd_options="   -A 127.0.0.1"
+-fabricd_options="-A 127.0.0.1"
++zebra_options="  -A 127.0.0.1 -s 90000000 -d"
++bgpd_options="   -A 127.0.0.1 -d"
++ospfd_options="  -A 127.0.0.1 -d"
++ospf6d_options=" -A ::1 -d"
++ripd_options="   -A 127.0.0.1 -d"
++ripngd_options=" -A ::1 -d"
++isisd_options="  -A 127.0.0.1 -d"
++pimd_options="   -A 127.0.0.1 -d"
++ldpd_options="   -A 127.0.0.1 -d"
++nhrpd_options="  -A 127.0.0.1 -d"
++eigrpd_options=" -A 127.0.0.1 -d"
++babeld_options=" -A 127.0.0.1 -d"
++sharpd_options=" -A 127.0.0.1 -d"
++pbrd_options="   -A 127.0.0.1 -d"
++staticd_options="-A 127.0.0.1 -d"
++bfdd_options="   -A 127.0.0.1 -d"
++fabricd_options="-A 127.0.0.1 -d"
  
- #
- # If the vtysh_enable is yes, then the unified config is read
+ # The list of daemons to watch is automatically generated by the init script.
+-#watchfrr_options=""
++watchfrr_enable=yes
++watchfrr_options="-d -r '/usr/bin/frr restart %s' -s '/usr/bin/frr start %s' -k '/usr/bin/frr stop %s'"
+ 
+ # for debugging purposes, you can specify a "wrap" command to start instead
+ # of starting the daemon directly, e.g. to use valgrind on ospfd:
 diff -Naupr frr-frr-7.0_orig/tools/frrcommon.sh.in frr-frr-7.0/tools/frrcommon.sh.in
 --- frr-frr-7.0_orig/tools/frrcommon.sh.in	2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frrcommon.sh.in	2019-04-29 11:50:28.826125721 +0700
++++ frr-frr-7.0/tools/frrcommon.sh.in	2019-05-10 14:32:51.919090139 +0700
 @@ -270,7 +270,7 @@ load_old_config() {
  	[ -s "$oldcfg" ] || return 0
  	grep -v '^[[:blank:]]*\(#\|$\)' "$oldcfg" > /dev/null || return 0
@@ -76,7 +81,7 @@ diff -Naupr frr-frr-7.0_orig/tools/frrcommon.sh.in frr-frr-7.0/tools/frrcommon.s
  . "$C_PATH/daemons"
 diff -Naupr frr-frr-7.0_orig/tools/frr.in frr-frr-7.0/tools/frr.in
 --- frr-frr-7.0_orig/tools/frr.in	2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frr.in	2019-04-29 11:50:23.632759891 +0700
++++ frr-frr-7.0/tools/frr.in	2019-05-10 14:32:51.919090139 +0700
 @@ -500,10 +500,9 @@ check_status()
  #########################################################
  
@@ -91,7 +96,7 @@ diff -Naupr frr-frr-7.0_orig/tools/frr.in frr-frr-7.0/tools/frr.in
  # Read configuration variable file if it is present
 diff -Naupr frr-frr-7.0_orig/tools/frr-reload frr-frr-7.0/tools/frr-reload
 --- frr-frr-7.0_orig/tools/frr-reload	2019-03-01 06:32:04.000000000 +0700
-+++ frr-frr-7.0/tools/frr-reload	2019-04-29 11:51:12.669735089 +0700
++++ frr-frr-7.0/tools/frr-reload	2019-05-10 14:32:51.919090139 +0700
 @@ -1,7 +1,7 @@
  #!/bin/sh