diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-10-17 22:55:02 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-10-17 22:55:02 +0200 |
| commit | 183130bcfa3c6bf5dbf73c38c1609c7b6bf21d3f (patch) | |
| tree | c86c0fb198a3d560e6f6749cd803563f92165362 /interface-definitions | |
| parent | 60109764cc18ae50802313716ce9197c9bd36e15 (diff) | |
| parent | b90041af38c1d872210d3720c258721247d313a5 (diff) | |
| download | vyos-1x-183130bcfa3c6bf5dbf73c38c1609c7b6bf21d3f.tar.gz vyos-1x-183130bcfa3c6bf5dbf73c38c1609c7b6bf21d3f.zip | |
Merge branch 'bridge' of github.com:c-po/vyos-1x into current
* 'bridge' of github.com:c-po/vyos-1x:
smoketest: add IPv6 option tests to BasicInterfaceTest
ifconfig: T2985: support on demand bridge creation
geneve: T1799: add IPv6 CLI options
op-mode: add "show arp" command
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/interfaces-geneve.xml.in | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 787e856d7..0a777865b 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -5,7 +5,7 @@ <tagNode name="bridge" owner="${vyos_conf_scripts_dir}/interfaces-bridge.py"> <properties> <help>Bridge Interface</help> - <priority>489</priority> + <priority>310</priority> <constraint> <regex>^br[0-9]+$</regex> </constraint> diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 28df42220..320dfd64d 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -28,6 +28,12 @@ #include <include/interface-enable-proxy-arp.xml.i> </children> </node> + <node name="ipv6"> + <children> + #include <include/ipv6-disable-forwarding.xml.i> + #include <include/ipv6-dup-addr-detect-transmits.xml.i> + </children> + </node> #include <include/interface-mac.xml.i> #include <include/interface-mtu-1450-9000.xml.i> <leafNode name="remote"> |