From 9289b9337335fc52444142402621de630824b902 Mon Sep 17 00:00:00 2001 From: Mobashshera Rasool Date: Tue, 21 Jun 2022 00:30:39 -0700 Subject: [PATCH] redhat: Always disable PIM6d on CentOS 6 and RedHat 6 systems Since these systems are too old to correctly support the protocol disabling the PIM6d. Also by default disable on all. Use --enable-pim6d flag to enable it. Signed-off-by: Mobashshera Rasool --- redhat/frr.spec.in | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 9d3d2b064..135c065b1 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -24,6 +24,7 @@ %{!?with_pam: %global with_pam 0 } %{!?with_pbrd: %global with_pbrd 1 } %{!?with_pimd: %global with_pimd 1 } +%{!?with_pim6d: %global with_pim6d 0 } %{!?with_vrrpd: %global with_vrrpd 1 } %{!?with_rtadv: %global with_rtadv 1 } %{!?with_watchfrr: %global with_watchfrr 1 } @@ -81,6 +82,7 @@ # if CentOS / RedHat and version < 7, then disable PIMd (too old, won't work) %if 0%{?rhel} && 0%{?rhel} < 7 %global with_pimd 0 + %global with_pim6d 0 %endif # misc internal defines @@ -102,6 +104,12 @@ %define daemon_pimd "" %endif +%if %{with_pim6d} + %define daemon_pim6d pim6d +%else + %define daemon_pim6d "" +%endif + %if %{with_pbrd} %define daemon_pbrd pbrd %else @@ -150,7 +158,7 @@ %define daemon_pathd "" %endif -%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} %{daemon_bfdd} %{daemon_vrrpd} %{daemon_pathd} +%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_pim6d} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd} %{daemon_bfdd} %{daemon_vrrpd} %{daemon_pathd} #release sub-revision (the two digits after the CONFDATE) %{!?release_rev: %global release_rev 01 } @@ -342,6 +350,11 @@ routing state through standard SNMP MIBs. %else --disable-pimd \ %endif +%if %{with_pim6d} + --enable-pim6d \ +%else + --disable-pim6d \ +%endif %if %{with_pbrd} --enable-pbrd \ %else @@ -666,6 +679,9 @@ fi %if %{with_pimd} %{_sbindir}/pimd %endif +%if %{with_pim6d} + %{_sbindir}/pim6d +%endif %if %{with_pbrd} %{_sbindir}/pbrd %endif -- 2.39.5