diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-07 13:45:07 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-07 13:45:07 +0100 |
| commit | 4bb9d26c6d4c475b095d944c3154ff4f0f92a205 (patch) | |
| tree | 17ad0be2622b2a3003b40ab98a3da551787bf558 /interface-definitions/include | |
| parent | c99150f516c5555e15f454aca49c59b954a2d9f1 (diff) | |
| download | vyos-1x-4bb9d26c6d4c475b095d944c3154ff4f0f92a205.tar.gz vyos-1x-4bb9d26c6d4c475b095d944c3154ff4f0f92a205.zip | |
T2653: migrate "ip" and "ipv6" interface options to generic includes
This reduces duplicated #include statements as each interface type already
contained the individual includes.
Diffstat (limited to 'interface-definitions/include')
| -rw-r--r-- | interface-definitions/include/interface-ipv4-options.xml.i (renamed from interface-definitions/include/interface-ipv4.xml.i) | 5 | ||||
| -rw-r--r-- | interface-definitions/include/interface-ipv6-options.xml.i (renamed from interface-definitions/include/interface-ipv6.xml.i) | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4-options.xml.i index 66842ab9b..416e1adf5 100644 --- a/interface-definitions/include/interface-ipv4.xml.i +++ b/interface-definitions/include/interface-ipv4-options.xml.i @@ -1,14 +1,17 @@ -<!-- included start from interface-ipv4.xml.i --> +<!-- included start from interface-ipv4-options.xml.i --> <node name="ip"> <properties> <help>IPv4 routing parameters</help> </properties> <children> + #include <include/interface-arp-cache-timeout.xml.i> #include <include/interface-disable-arp-filter.xml.i> #include <include/interface-disable-forwarding.xml.i> #include <include/interface-enable-arp-accept.xml.i> #include <include/interface-enable-arp-announce.xml.i> #include <include/interface-enable-arp-ignore.xml.i> + #include <include/interface-enable-proxy-arp.xml.i> + #include <include/interface-proxy-arp-pvlan.xml.i> </children> </node> <!-- included end --> diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6-options.xml.i index c9299890b..a94c6572b 100644 --- a/interface-definitions/include/interface-ipv6.xml.i +++ b/interface-definitions/include/interface-ipv6-options.xml.i @@ -1,4 +1,4 @@ -<!-- included start from interface-ipv6.xml.i --> +<!-- included start from interface-ipv6-options.xml.i --> <node name="ipv6"> <properties> <help>IPv6 routing parameters</help> |