From: David Lamparter Date: Sun, 24 Mar 2019 14:52:02 +0000 (+0100) Subject: tools/frrcommon.sh: ignore 'declare' failures X-Git-Tag: frr-7.0.1~17^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3990%2Fhead;p=mirror%2Ffrr.git tools/frrcommon.sh: ignore 'declare' failures The "declare -p watchfrr_options" call is just to support backwards compatibility. If it fails, silently ignore that. Signed-off-by: David Lamparter --- diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 76a0d617ba..897e6d6558 100644 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -291,7 +291,7 @@ load_old_config "$C_PATH/daemons.conf" load_old_config "/etc/default/frr" load_old_config "/etc/sysconfig/frr" -if declare -p watchfrr_options | grep -q '^declare \-a'; then +if { declare -p watchfrr_options 2>/dev/null || true; } | grep -q '^declare \-a'; then log_warning_msg "watchfrr_options contains a bash array value." \ "The configured value is intentionally ignored since it is likely wrong." \ "Please remove or fix the setting."