diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-11 22:03:42 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-09-13 13:52:13 +0000 |
| commit | 5f3a5ea1263240801bab5243731eaaae9192bd89 (patch) | |
| tree | 52ead5dde1734546b20af9bb7db79ddf22c1a64a | |
| parent | 0006a5c453f123d37d630c018abf8c7477f80198 (diff) | |
| download | vyos-build-5f3a5ea1263240801bab5243731eaaae9192bd89.tar.gz vyos-build-5f3a5ea1263240801bab5243731eaaae9192bd89.zip | |
frr: T5239: remove daemons.conf generated by chroot hook
Daemon configuration is now generated during boot via vyos-1x repo.
See https://github.com/vyos/vyos-1x/pull/2245
(cherry picked from commit a9a1ca3cbb0951a37de286fffb2554103b561846)
| -rwxr-xr-x | data/live-build-config/hooks/live/30-frr-configs.chroot | 72 |
1 files changed, 0 insertions, 72 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 deleted file mode 100755 index 03b1af6c..00000000 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python3 - -# For FRR to work in VyOS as expected we need a few fixups -# -# 1. Enable daemons we use in /etc/frr/daemons -# 2. Set the VRF backend of Zebra to netns (-n option) in /etc/frr/daemons.conf -# Otherwise multiple routing tables for PBR won't work -# 3. Create empty configs for daemons with use -# That is to make them possible to start on boot before config is loaded -# - -import os - -daemons = """ -zebra=yes -bgpd=yes -ospfd=yes -ospf6d=yes -ripd=yes -ripngd=yes -isisd=yes -pimd=no -pim6d=yes -ldpd=yes -nhrpd=no -eigrpd=yes -babeld=yes -sharpd=no -pbrd=no -bfdd=yes -staticd=yes - -vtysh_enable=yes -zebra_options="-s 90000000 --daemon -A 127.0.0.1 -M snmp" -bgpd_options="--daemon -A 127.0.0.1 -M snmp -M rpki -M bmp" -ospfd_options="--daemon -A 127.0.0.1 -M snmp" -ospf6d_options="--daemon -A ::1 -M snmp" -ripd_options="--daemon -A 127.0.0.1 -M snmp" -ripngd_options="--daemon -A ::1" -isisd_options="--daemon -A 127.0.0.1 -M snmp" -pimd_options="--daemon -A 127.0.0.1" -pim6d_options=""--daemon -A ::1" -ldpd_options="--daemon -A 127.0.0.1" -nhrpd_options="--daemon -A 127.0.0.1" -mgmtd_options=" --daemon -A 127.0.0.1" -eigrpd_options="--daemon -A 127.0.0.1" -babeld_options="--daemon -A 127.0.0.1" -sharpd_options="--daemon -A 127.0.0.1" -pbrd_options="--daemon -A 127.0.0.1" -staticd_options="--daemon -A 127.0.0.1" -bfdd_options="--daemon -A 127.0.0.1" - -watchfrr_enable=no -valgrind_enable=no -""" - -frr_conf = """ -log syslog -log facility local7 -""" - -frr_log = '' - -with open("/etc/frr/daemons", "w") as f: - f.write(daemons) - -with open("/etc/frr/frr.conf", "w") as f: - f.write(frr_conf) - -# Prevent writing logs to /var/log/frr/frr.log. T2061 -with open("/etc/rsyslog.d/45-frr.conf", "w") as f: - f.write(frr_log) |