diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-02-27 15:42:00 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-02-27 15:42:02 +0100 |
commit | e1953f210eeb0e523bd7f142e453061a72939d72 (patch) | |
tree | da2f018d26073f866fa8e813c0a79e81290885a6 | |
parent | 3a33f49eb2b199ca801f70cde0ff060c7097784a (diff) | |
download | vyos-build-e1953f210eeb0e523bd7f142e453061a72939d72.tar.gz vyos-build-e1953f210eeb0e523bd7f142e453061a72939d72.zip |
frr: remove local rpki frr-reload patch as this has been backported to 7.5
-rw-r--r-- | packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch b/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch deleted file mode 100644 index 053a5acb..00000000 --- a/packages/frr/patches/0001-frr-reload-rpki-context-exiting-uses-exit-and-not-en.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 258409cfa05aaa378e4f120dc67fb226465fa829 Mon Sep 17 00:00:00 2001 -From: Runar Borge <runar@borge.nu> -Date: Sat, 23 Jan 2021 00:15:41 +0100 -Subject: [PATCH] frr-reload: rpki context exiting uses exit and not end - -Issue: -The rpki subcontext uses exit instead of end to exit. -This makes issues with frr-reload in the way that frr-reload never exits -rpki context until it reaches the next end statement. this also happens when -parsing the configuration from vtysh. - -Signed-off-by: Runar Borge <runar@borge.nu> ---- - tools/frr-reload.py | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/tools/frr-reload.py b/tools/frr-reload.py -index 412cde091..33c4ef5e5 100755 ---- a/tools/frr-reload.py -+++ b/tools/frr-reload.py -@@ -452,6 +452,17 @@ end - ctx_keys = [] - current_context_lines = [] - -+ elif (line == "exit" and -+ ctx_keys[0].startswith('rpki')): -+ self.save_contexts(ctx_keys, current_context_lines) -+ log.debug('LINE %-50s: exiting old context, %-50s', line, ctx_keys) -+ -+ # Start a new context -+ new_ctx = True -+ main_ctx_key = [] -+ ctx_keys = [] -+ current_context_lines = [] -+ - elif line == "exit-vrf": - self.save_contexts(ctx_keys, current_context_lines) - current_context_lines.append(line) --- -2.20.1 - |