diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-25 19:03:16 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 19:03:16 +0100 | 
| commit | 2228df50afbc7128125f2364cf95ed313872e4e9 (patch) | |
| tree | 554347536db3ca1ca790b6c3d2ee22cb35f915be | |
| parent | 0eed76532bd37836aa587012f975de4970d5d33d (diff) | |
| parent | 43da31bd19f817d2833deffae69cf1e062f5bdc2 (diff) | |
| download | vyos-build-2228df50afbc7128125f2364cf95ed313872e4e9.tar.gz vyos-build-2228df50afbc7128125f2364cf95ed313872e4e9.zip  | |
Merge pull request #133 from sever-sever/T2061
frr-syslog: T2061: Moving FRR logs to messages: Fix debug mode
| -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 97abe1e6..e7873912 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()  | 
