From 314eee33f6900a0fa185d0622eb4a3b9dd69142d Mon Sep 17 00:00:00 2001 From: Gabriel Somlo Date: Tue, 15 Mar 2022 14:09:15 -0400 Subject: [PATCH] frrboot: add fedora sbin path to default Add the Fedora default location for FRR binaries (/usr/libexec/frr/*.) to CORE's frrboot default "sbin" search path Signed-off-by: Gabriel Somlo --- daemon/core/configservices/frrservices/services.py | 2 +- daemon/core/services/frr.py | 2 +- daemon/data/core.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/core/configservices/frrservices/services.py b/daemon/core/configservices/frrservices/services.py index dd2d1f9d..5e6c9948 100644 --- a/daemon/core/configservices/frrservices/services.py +++ b/daemon/core/configservices/frrservices/services.py @@ -89,7 +89,7 @@ class FRRZebra(ConfigService): "frr_bin_search", default="/usr/local/bin /usr/bin /usr/lib/frr" ).strip('"') frr_sbin_search = self.node.session.options.get( - "frr_sbin_search", default="/usr/local/sbin /usr/sbin /usr/lib/frr" + "frr_sbin_search", default="/usr/local/sbin /usr/sbin /usr/lib/frr /usr/libexec/frr" ).strip('"') services = [] diff --git a/daemon/core/services/frr.py b/daemon/core/services/frr.py index 87145d37..c8ad1048 100644 --- a/daemon/core/services/frr.py +++ b/daemon/core/services/frr.py @@ -142,7 +142,7 @@ class FRRZebra(CoreService): "frr_bin_search", '"/usr/local/bin /usr/bin /usr/lib/frr"' ) frr_sbin_search = node.session.options.get( - "frr_sbin_search", '"/usr/local/sbin /usr/sbin /usr/lib/frr"' + "frr_sbin_search", '"/usr/local/sbin /usr/sbin /usr/lib/frr /usr/libexec/frr"' ) cfg = """\ #!/bin/sh diff --git a/daemon/data/core.conf b/daemon/data/core.conf index 874ba567..1923250d 100644 --- a/daemon/data/core.conf +++ b/daemon/data/core.conf @@ -5,7 +5,7 @@ grpcport = 50051 quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga" quagga_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/quagga" frr_bin_search = "/usr/local/bin /usr/bin /usr/lib/frr" -frr_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/frr" +frr_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/frr /usr/libexec/frr" # uncomment the following line to load custom services from the specified dir # this may be a comma-separated list, and directory names should be unique