From 940decbcd6a9e50c37e1661b4d409860a2ca3158 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 19 Jun 2019 14:30:41 +0200
Subject: 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.
---
 data/live-build-config/hooks/live/30-frr-configs.chroot | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'data')

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:
-- 
cgit v1.2.3