diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-06-19 13:30:17 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-06-19 14:15:57 +0200 |
| commit | 9408874d122c16756c25c536bf4578189e0d2a9b (patch) | |
| tree | 7b69eca44dc9e11b6d54754e22b599ad3ec30d30 /data | |
| parent | 832fb2869f90056759e9464619326530b69791db (diff) | |
| download | vyos-build-9408874d122c16756c25c536bf4578189e0d2a9b.tar.gz vyos-build-9408874d122c16756c25c536bf4578189e0d2a9b.zip | |
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.
(cherry picked from commit 6638c5d0f1a6c8b0a4d8fc016c1797c4526a53fd)
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/30-frr-configs.chroot | 5 |
1 files changed, 0 insertions, 5 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 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() |