diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-03-25 12:45:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-25 12:45:04 +0100 |
| commit | 08d47116842f8206b23f1defa520bf23283e3588 (patch) | |
| tree | 4ea730a6faae56e22cbc8e2aceea04703350bf59 /tools | |
| parent | Merge branch 'frr/pull/4005' (diff) | |
| parent | tools/frrcommon.sh: ignore 'declare' failures (diff) | |
| download | frr-08d47116842f8206b23f1defa520bf23283e3588.tar.xz frr-08d47116842f8206b23f1defa520bf23283e3588.zip | |
Merge pull request #3989 from opensourcerouting/redhat-new-init
redhat: switch to new init script
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/frrcommon.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 76a0d617b..897e6d655 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." |