afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

frrboot: add fedora sbin path to default

Browse source 
Add the Fedora default location for FRR binaries (/usr/libexec/frr/*.)
to CORE's frrboot default "sbin" search path

Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
This commit is contained in:
Gabriel Somlo 2022-03-15 14:09:15 -04:00
parent 443c0e708f
commit 314eee33f6
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/configservices/frrservices/services.py
View file

@ -89,7 +89,7 @@ class FRRZebra(ConfigService):
"frr_bin_search", default="/usr/local/bin /usr/bin /usr/lib/frr" "frr_bin_search", default="/usr/local/bin /usr/bin /usr/lib/frr"
).strip('"') ).strip('"')
frr_sbin_search = self.node.session.options.get( 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('"') ).strip('"')
services = [] services = []

2
daemon/core/services/frr.py
View file

@ -142,7 +142,7 @@ class FRRZebra(CoreService):
"frr_bin_search", '"/usr/local/bin /usr/bin /usr/lib/frr"' "frr_bin_search", '"/usr/local/bin /usr/bin /usr/lib/frr"'
) )
frr_sbin_search = node.session.options.get( 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 = """\ cfg = """\
#!/bin/sh #!/bin/sh

2
daemon/data/core.conf
View file

@ -5,7 +5,7 @@ grpcport = 50051
quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga" quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga"
quagga_sbin_search = "/usr/local/sbin /usr/sbin /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_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 # 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 # this may be a comma-separated list, and directory names should be unique