Merge pull request #4020 from cfra/feature/improve-init-script

tools/frr.in: Only attempt to load daemons.conf if present
This commit is contained in:
Quentin Young 2019-03-26 11:23:43 -04:00 committed by GitHub
commit 860ff05896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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