From f8c01ef3cf31e9d0fe57a51e32a7352079d0d7e7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 4 Dec 2020 13:48:43 +0100
Subject: vyos.ifconfig: T1579: migrate "ip source-validation" option from
 vyatta-cfg-quagga

---
 Makefile | 47 ++++++++---------------------------------------
 1 file changed, 8 insertions(+), 39 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cd66809e3..256a600f6 100644
--- a/Makefile
+++ b/Makefile
@@ -38,45 +38,6 @@ interface_definitions: $(BUILD_DIR) $(obj)
 	# XXX: delete top level node.def's that now live in other packages
 	rm -f $(TMPL_DIR)/firewall/node.def
 	rm -f $(TMPL_DIR)/interfaces/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/vif/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/vif/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/vif-s/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/bonding/node.tag/vif-s/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/bridge/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/bridge/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/ethernet/node.tag/vif-s/node.tag/ip/node.def
-	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
-	rm -f $(TMPL_DIR)/interfaces/pppoe/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/tunnel/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/tunnel/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/vxlan/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/vxlan/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/wireless/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/wireless/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/wireless/node.tag/vif/node.tag/ip/node.def
-	rm -f $(TMPL_DIR)/interfaces/wireless/node.tag/vif/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/wirelessmodem/node.tag/ipv6/node.def
-	rm -f $(TMPL_DIR)/interfaces/wireguard/node.tag/ipv6/node.def
 	rm -f $(TMPL_DIR)/protocols/node.def
 	rm -rf $(TMPL_DIR)/protocols/nbgp
 	rm -f $(TMPL_DIR)/protocols/static/node.def
@@ -86,6 +47,14 @@ interface_definitions: $(BUILD_DIR) $(obj)
 	rm -f $(TMPL_DIR)/vpn/ipsec/node.def
 	rm -rf $(TMPL_DIR)/vpn/nipsec
 
+	# Requires until OSPF and RIP is migrated from vyatta-cfg-quagga to vyos-1x
+	mkdir $(TMPL_DIR)/interfaces/loopback/node.tag/ipv6
+	mkdir $(TMPL_DIR)/interfaces/dummy/node.tag/ipv6
+	mkdir $(TMPL_DIR)/interfaces/openvpn/node.tag/ip
+	cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def $(TMPL_DIR)/interfaces/loopback/node.tag/ipv6
+	cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ipv6/node.def $(TMPL_DIR)/interfaces/dummy/node.tag/ipv6
+	cp $(TMPL_DIR)/interfaces/ethernet/node.tag/ip/node.def $(TMPL_DIR)/interfaces/openvpn/node.tag/ip
+
 .PHONY: op_mode_definitions
 .ONESHELL:
 op_mode_definitions:
-- 
cgit v1.2.3