Merge branch 'current' of github.com:vyos/vyos-build into current

This commit is contained in:
Kim Hagen 2018-12-17 21:05:55 +01:00
commit 7889203766

View File

@ -32,7 +32,7 @@ bfdd=no
daemons_conf = """ daemons_conf = """
vtysh_enable=yes vtysh_enable=yes
zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -M snmp -n" zebra_options=" -s 90000000 --daemon -A 127.0.0.1 -M snmp -n"
bgpd_options=" --daemon -A 127.0.0.1 -M snmp" bgpd_options=" --daemon -A 127.0.0.1 -M snmp -M rpki"
ospfd_options=" --daemon -A 127.0.0.1 -M snmp" ospfd_options=" --daemon -A 127.0.0.1 -M snmp"
ospf6d_options=" --daemon -A ::1 -M snmp" ospf6d_options=" --daemon -A ::1 -M snmp"
ripd_options=" --daemon -A 127.0.0.1 -M snmp" ripd_options=" --daemon -A 127.0.0.1 -M snmp"