summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-07 13:47:32 +0100
committerChristian Poessinger <christian@poessinger.com>2020-11-07 13:47:32 +0100
commit87550b469a69a1f33fc0a66e5f9fadcbc84c838e (patch)
tree0b1a5de9f04b2421a732bb64d174b6edae066b1f
parent948c35b5b451a627ff27b61b8bf854da041fdd65 (diff)
downloadvyos-1x-87550b469a69a1f33fc0a66e5f9fadcbc84c838e.tar.gz
vyos-1x-87550b469a69a1f33fc0a66e5f9fadcbc84c838e.zip
l2tpv3: T2653: include common "ip" interface options
-rw-r--r--Makefile1
-rw-r--r--interface-definitions/interfaces-l2tpv3.xml.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e85835eec..fffd1c9c3 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,7 @@ interface_definitions: $(BUILD_DIR) $(obj)
rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/ipv6/node.def
rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/node.def
rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ipv6/node.def
+ rm -f $(TMPL_DIR)/interfaces/l2tpv3/node.tag/ip/node.def
rm -f $(TMPL_DIR)/interfaces/l2tpv3/node.tag/ipv6/node.def
rm -f $(TMPL_DIR)/interfaces/openvpn/node.tag/ipv6/node.def
rm -f $(TMPL_DIR)/interfaces/pppoe/node.tag/ip/node.def
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 6c971b5f4..a8ddb74fb 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -53,6 +53,7 @@
</properties>
<defaultValue>udp</defaultValue>
</leafNode>
+ #include <include/interface-ipv4-options.xml.i>
#include <include/interface-ipv6-options.xml.i>
<leafNode name="local-ip">
<properties>