diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-12-22 22:18:57 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-22 22:18:57 +0700 |
| commit | 1bbcfe41da9eb9e4d4242ee2b88ce209739f80b9 (patch) | |
| tree | 334c06220b4bd3d22dc44694a5c5056c4ff1ead8 /data | |
| parent | 1903554175de245c755f6916bd5a3502e511d931 (diff) | |
| parent | 61ffbb3e9e77c350edd0076c4d6c0416fa31b1fb (diff) | |
| download | vyos-build-1bbcfe41da9eb9e4d4242ee2b88ce209739f80b9.tar.gz vyos-build-1bbcfe41da9eb9e4d4242ee2b88ce209739f80b9.zip | |
Merge pull request #138 from sever-sever/T2061-crux
frr-syslog: T2061: Moving FRR logs to messages: Crux
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/30-frr-configs.chroot | 14 |
1 files changed, 14 insertions, 0 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 3380ef8c..b1899a06 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -51,9 +51,23 @@ 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) + # 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() |