summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-07-31 22:38:34 +0200
committerChristian Poessinger <christian@poessinger.com>2021-07-31 22:38:41 +0200
commitf3556f6638ccef811a9f5b9208362286be0afdec (patch)
tree013e8d96576c9cd7fa42f4e21fe820f09b303f35
parentde1d70636feb415e69c2dac5716195508f8a3477 (diff)
downloadvyos-build-f3556f6638ccef811a9f5b9208362286be0afdec.tar.gz
vyos-build-f3556f6638ccef811a9f5b9208362286be0afdec.zip
Revert "frr: add bfdd to frr-reload.py daemons list"
This reverts commit 239adee7560051e6e506e2859407611956608bba. Patch is not mainlined in FRR.
-rw-r--r--packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch b/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch
deleted file mode 100644
index 3d51e8de..00000000
--- a/packages/frr/patches/0002-tools-add-bfdd-to-frr-reload.py-daemons-list.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a1019153294df7093c11dd7fc5b998c0b3a75085 Mon Sep 17 00:00:00 2001
-From: Emanuele Di Pascale <emanuele@voltanet.io>
-Date: Tue, 22 Dec 2020 18:20:14 +0100
-Subject: [PATCH] tools: add bfdd to frr-reload.py daemons list
-
-Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
-Signed-off-by: Christian Poessinger <christian@poessinger.com>
-
-(cherry picked from commit ee96c52a2828335c698c27ee7f7374204a97d4cb)
----
- 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 9f37d44aa..a3aed7719 100755
---- a/tools/frr-reload.py
-+++ b/tools/frr-reload.py
-@@ -1388,7 +1388,7 @@ if __name__ == '__main__':
- sys.exit(1)
-
- # verify that the daemon, if specified, is valid
-- if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd']:
-+ if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd', 'bfdd']:
- log.error("Daemon %s is not a valid option for 'show running-config'" % args.daemon)
- sys.exit(1)
-
---
-2.20.1