proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/frr.in: Only attempt to load daemons.conf if present

Browse Source 
Apparently, the default changed to use `/etc/frr/daemons` instead of
`/etc/frr/daemons.conf`. Therefore, we should ignore absence of the
latter file, because its absence is not an actuall error but will
cause a confusing error message like this:

    /etc/init.d/frr: line 507: /etc/frr/daemons.conf: No such file or directory
This commit is contained in:
Christian Franke 2019-03-26 10:28:09 +01:00
parent dfff60ed31
commit a55578f631
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/frr.in
View File

@ -504,7 +504,9 @@ check_status()
# Load configuration
. "$C_PATH/daemons"
. "$C_PATH/daemons.conf"
if [ -e "$C_PATH/daemons.conf" ]; then
. "$C_PATH/daemons.conf"
fi
# Read configuration variable file if it is present
[ -r /etc/default/frr ] && . /etc/default/frr