summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2019-03-26 10:28:09 +0100
committerChristian Franke <chris@opensourcerouting.org>2019-03-26 10:33:45 +0100
commita55578f631e054d45ad14d74a0d45f53a0c634be (patch)
tree75b6cd9b3d32f7ae32019ee89e244a4ba08ca309 /tools
parentMerge pull request #4010 from sarav511/3988 (diff)
downloadfrr-a55578f631e054d45ad14d74a0d45f53a0c634be.tar.xz
frr-a55578f631e054d45ad14d74a0d45f53a0c634be.zip
tools/frr.in: Only attempt to load daemons.conf if present
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/frr.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/frr.in b/tools/frr.in
index a443191fd..2e3a09458 100755
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -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