diff options
| author | Runar Borge <runar@borge.nu> | 2020-06-25 20:30:44 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2020-06-28 00:24:48 +0200 |
| commit | d611c31fbf132aac329db8e19e67076cfdd0d540 (patch) | |
| tree | a67a0d1290e266d84c85e34ebfdb937f41e95156 /packages/frr/patches | |
| parent | f2f6332ca1acd9d3e885943895340ac5bb6caf4e (diff) | |
| download | vyos-build-d611c31fbf132aac329db8e19e67076cfdd0d540.tar.gz vyos-build-d611c31fbf132aac329db8e19e67076cfdd0d540.zip | |
T2638: FRR: FRR-reload needs patching to work on 7.3.0
Because of FRR bug 6062 (https://github.com/FRRouting/frr/issues/6062) frr-reload in frr 7.3.0 and 7.3.1
needs to be patched to work properly. without this patch frr-reload will allways compare against
a blank/empty running configuration.
Diffstat (limited to 'packages/frr/patches')
| -rw-r--r-- | packages/frr/patches/0001-Fix-6062-frr-reload-always-seems-to-reapply-configs.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/packages/frr/patches/0001-Fix-6062-frr-reload-always-seems-to-reapply-configs.patch b/packages/frr/patches/0001-Fix-6062-frr-reload-always-seems-to-reapply-configs.patch new file mode 100644 index 00000000..ce74b25a --- /dev/null +++ b/packages/frr/patches/0001-Fix-6062-frr-reload-always-seems-to-reapply-configs.patch @@ -0,0 +1,31 @@ +From d3851bdceff09301e110f839af7878e1fb4607c8 Mon Sep 17 00:00:00 2001 +From: Runar Borge <runar@borge.nu> +Date: Thu, 25 Jun 2020 20:14:47 +0200 +Subject: [PATCH] Fix #6062 frr-reload always seems to reapply configs + +https://github.com/FRRouting/frr/issues/6062 +dteach-rv commented on 30 Apr +It looks like there was a concerted effort to handle the vtysh -> stderr output +change in frr-reload.py. But the subprocess call in def load-from_show_running +was missed, which is why frr-reload.py is trying to re-add every command. +It's comparing the file config to an empty running config. +--- + tools/frr-reload.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/frr-reload.py b/tools/frr-reload.py +index 3e97635df..f4eb8400e 100755 +--- a/tools/frr-reload.py ++++ b/tools/frr-reload.py +@@ -155,7 +155,7 @@ class Config(object): + try: + config_text = subprocess.check_output( + bindir + "/vtysh --config_dir " + confdir + " -c 'show run " + daemon + "' | /usr/bin/tail -n +4 | " + bindir + "/vtysh --config_dir " + confdir + " -m -f -", +- shell=True) ++ shell=True, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as e: + ve = VtyshMarkException(e) + ve.output = e.output +-- +2.25.1 + |