From 798b95eb9776486aed874346869a8238383c18f6 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 8 Feb 2024 22:56:23 +0100 Subject: frr: T6023: add pending upstream patches Latest stable/9.0 FRR branch has an updated version of frr-reload.py which is more strict on the commands to remove from the running config. This resulted in some issues in the codebase of FRR which are addressed in the attached patches and are pending for upstream integration. --- ...upport-for-no-router-info-area-as-command.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch (limited to 'packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch') diff --git a/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch b/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch new file mode 100644 index 00000000..f6e5a109 --- /dev/null +++ b/packages/frr/patches/0001-ospfd-add-support-for-no-router-info-area-as-command.patch @@ -0,0 +1,42 @@ +From c86cf962743f3db90c027967ba5c92eaed28dd77 Mon Sep 17 00:00:00 2001 +From: Christian Breunig +Date: Thu, 8 Feb 2024 22:39:04 +0100 +Subject: [PATCH] ospfd: add support for "no router-info [] command" + +frr-reload.py will walk through all config contexts and prepend no to the CLI +command. This requires that the vtysh shell code accepts a full command. + +To Reproduce + +vtysh -c "conf t" -c "router ospf" -c "router-info area" +vtysh -c "conf t" -c "router ospf" -c "no router-info area" +% Unknown command: no router-info area +vtysh -c "conf t" -c "router ospf" -c "no router-info" + +Signed-off-by: Christian Breunig +(cherry picked from commit e744db5098dcdca1bce32169aaa0703a21ab6b0c) +--- + ospfd/ospf_ri.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c +index 725443f49..80e7f5931 100644 +--- a/ospfd/ospf_ri.c ++++ b/ospfd/ospf_ri.c +@@ -1722,9 +1722,11 @@ DEFUN (router_info, + + DEFUN (no_router_info, + no_router_info_cmd, +- "no router-info", ++ "no router-info []", + NO_STR +- "Disable the Router Information functionality\n") ++ "Disable the Router Information functionality\n" ++ "Disable the Router Information functionality with AS flooding scope\n" ++ "Disable the Router Information functionality with Area flooding scope\n") + { + + if (!OspfRI.enabled) +-- +2.39.2 + -- cgit v1.2.3