summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-09-15 20:13:07 +0200
committerChristian Poessinger <christian@poessinger.com>2019-09-15 20:13:07 +0200
commitc4d0b9ed4736911d341efdebf34997e6cee8c5a8 (patch)
tree69a17499eb72a52b33cf5b92551316b879984694 /Makefile
parenta9a68a6f1086fd4c978deaf5ddace69c18443756 (diff)
parent6e169b011569bddd0c07d476528a3ecad56e6499 (diff)
downloadvyos-1x-c4d0b9ed4736911d341efdebf34997e6cee8c5a8.tar.gz
vyos-1x-c4d0b9ed4736911d341efdebf34997e6cee8c5a8.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: bonding: T1614: do not overwrite interface description with interface name [openvpn] T1661 Adding additional check for tls_dh if it not need for ovpn client [openvpn] T1662 Defined default remote port if it not set in cli [openvpn] T1661 Fixing returned value on check function bonding: T1614: use proper (previously missing) miimon property Python/ifconfig: T1557: bonding: add miimon property Python/ifconfig: T1557: bonding: fix class name in comments bonding: T1660: bugfix for triggered OS permission denied exception Revert "[bonding] T1660 Adding additional check. Some bonding mode don't support arp_interval" [bonding] T1660 Adding additional check. Some bonding mode don't support arp_interval [l2tp] T834 Implementation advanced ppp-options/lcp. openvpn: T1548: fix missing sys import [l2tp] T834 fix cli reset commands for l2tp and pptp. Adding l2tp%d tunnel naming.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ad05acff5..61bc06c47 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ op_mode_definitions:
rm -f $(OP_TMPL_DIR)/show/vpn/node.def
rm -f $(OP_TMPL_DIR)/show/system/node.def
rm -f $(OP_TMPL_DIR)/delete/node.def
+ rm -f $(OP_TMPL_DIR)/reset/vpn/node.def
.PHONY: all
all: clean interface_definitions op_mode_definitions