summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-06-19 14:30:41 +0200
committerChristian Poessinger <christian@poessinger.com>2019-06-19 14:31:30 +0200
commit940decbcd6a9e50c37e1661b4d409860a2ca3158 (patch)
treeed0b7d65ada854ea756d31c8dfb734ba4125dc66
parent6638c5d0f1a6c8b0a4d8fc016c1797c4526a53fd (diff)
downloadvyos-build-940decbcd6a9e50c37e1661b4d409860a2ca3158.tar.gz
vyos-build-940decbcd6a9e50c37e1661b4d409860a2ca3158.zip
T1454: frr: remove no longer required watchfrr_options
Fixes the following startup warning: Jun 19 11:14:27 localhost watchfrr.sh: watchfrr_options contains a bash array value. The configured value is intentionally ignored since it is likely wrong. Please remove or fix the setting.
-rwxr-xr-xdata/live-build-config/hooks/live/30-frr-configs.chroot3
1 files changed, 0 insertions, 3 deletions
diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot
index b033d3b8..c984fee4 100755
--- a/data/live-build-config/hooks/live/30-frr-configs.chroot
+++ b/data/live-build-config/hooks/live/30-frr-configs.chroot
@@ -48,10 +48,7 @@ staticd_options=" --daemon -A 127.0.0.1"
bfdd_options=" --daemon -A 127.0.0.1"
watchfrr_enable=no
-watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB)
-
valgrind_enable=no
-valgrind=/usr/bin/valgrind
"""
with open("/etc/frr/daemons", "w") as f: