From 6638c5d0f1a6c8b0a4d8fc016c1797c4526a53fd Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 19 Jun 2019 13:30:17 +0200 Subject: T1454: remove deprecated /etc/frr/daemons.conf File which was still present (but not of any problem) caused the following message: Jun 19 11:14:27 localhost watchfrr.sh: Reading deprecated /etc/frr/daemons.conf. Please move its settings to /etc/frr/daemons and remove it. --- data/live-build-config/hooks/live/30-frr-configs.chroot | 5 ----- 1 file changed, 5 deletions(-) (limited to 'data/live-build-config/hooks/live/30-frr-configs.chroot') 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 d3cfbce5..b033d3b8 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -28,9 +28,7 @@ sharpd=no pbrd=no bfdd=no staticd=yes -""" -daemons_conf = """ vtysh_enable=yes zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -M snmp -n" bgpd_options=" --daemon -A 127.0.0.1 -M snmp -M rpki" @@ -59,9 +57,6 @@ valgrind=/usr/bin/valgrind with open("/etc/frr/daemons", "w") as f: f.write(daemons) -with open("/etc/frr/daemons.conf", "w") as f: - f.write(daemons_conf) - # Create empty daemon configs so that they start properly for name in ["zebra.conf", "bgpd.conf", "ospfd.conf", "ospf6d.conf", "ripd.conf", "ripngd.conf"]: open(os.path.join("/etc/frr", name), 'a').close() -- cgit v1.2.3 From 940decbcd6a9e50c37e1661b4d409860a2ca3158 Mon Sep 17 00:00:00 2001 From: Christian Poessinger 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/live-build-config/hooks/live/30-frr-configs.chroot') 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 From df64f25947438731958d6bf55fb126956de7c3d0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 23 Jun 2019 12:21:53 +0200 Subject: bfd: T1183: enable FRR bfdd service --- data/live-build-config/hooks/live/30-frr-configs.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/live-build-config/hooks/live/30-frr-configs.chroot') 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 c984fee4..3380ef8c 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -26,7 +26,7 @@ eigrpd=no babeld=no sharpd=no pbrd=no -bfdd=no +bfdd=yes staticd=yes vtysh_enable=yes -- cgit v1.2.3