From a55578f631e054d45ad14d74a0d45f53a0c634be Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Tue, 26 Mar 2019 10:28:09 +0100 Subject: [PATCH] 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 --- tools/frr.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/frr.in b/tools/frr.in index a443191fd0..2e3a094589 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 -- 2.39.5