From 10f8eded61aee04fdd3662afdf952bfb468b1197 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 17 Jul 2022 21:31:33 +0200 Subject: frr: T4536: no need for empty configuration files as we use the integrated-config option --- .../hooks/live/30-frr-configs.chroot | 36 ++++++++++------------ 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'data/live-build-config') 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 f81e9bb8..a516cc12 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -30,22 +30,22 @@ 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" -ldpd_options=" --daemon -A 127.0.0.1" -nhrpd_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" +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" +ldpd_options="--daemon -A 127.0.0.1" +nhrpd_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 @@ -67,7 +67,3 @@ with open("/etc/frr/frr.conf", "w") as f: # 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() -- cgit v1.2.3