diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-09 21:20:29 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-09 21:20:29 +0200 |
| commit | 28454f9613f41a1e70b60eec20930c2232e2d9c9 (patch) | |
| tree | 778fe4df0cffeed7513e33c5cbd0c438b8236fdd /interface-definitions | |
| parent | 9875a21bdb26df19f2faf3e81153dea15e4f9e3c (diff) | |
| parent | 316483cbe18811c6eaea07d5b790094a5de45abe (diff) | |
| download | vyos-1x-28454f9613f41a1e70b60eec20930c2232e2d9c9.tar.gz vyos-1x-28454f9613f41a1e70b60eec20930c2232e2d9c9.zip | |
Merge branch 'vxlan' of github.com:c-po/vyos-1x into current
* 'vxlan' of github.com:c-po/vyos-1x:
vxlan: pseudo-ethernet: T2260: convert link nodes to source-interface
wireguard: T2206: fix comment in migration script
pppoe: enable Jinja2 trim_blocks
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-pseudo-ethernet.xml.in | 4 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in index 0c56e4e4b..c6e61d19a 100644 --- a/interface-definitions/interfaces-pseudo-ethernet.xml.in +++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in @@ -40,9 +40,9 @@ #include <include/ipv6-dup-addr-detect-transmits.xml.i> </children> </node> - <leafNode name="link"> + <leafNode name="source-interface"> <properties> - <help>Lower link device</help> + <help>Physical Interface used for this device</help> <valueHelp> <format>interface</format> <description>Interface used for VXLAN underlay</description> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index 3108817b3..5dcaf065c 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -52,9 +52,9 @@ #include <include/ipv6-dup-addr-detect-transmits.xml.i> </children> </node> - <leafNode name="link"> + <leafNode name="source-interface"> <properties> - <help>Underlay device of VXLAN interface</help> + <help>Physical Interface used for this connection</help> <valueHelp> <format>interface</format> <description>Interface used for VXLAN underlay</description> |