summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-14 02:56:41 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-14 02:56:41 +0200
commitb58cf978599da16ca685f2b83b555ab53dde3071 (patch)
tree74ebb46678c38d08867cdccf363bc4b563e52e9e /Makefile
parent00f4d8ad780001b9a3f534c32d485676bc97993a (diff)
downloadvyos-1x-b58cf978599da16ca685f2b83b555ab53dde3071.tar.gz
vyos-1x-b58cf978599da16ca685f2b83b555ab53dde3071.zip
T602: remove support for the type element and correct the logic for setting the type in generated command templates.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 0 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index d194b44e4..de7c136eb 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,6 @@ interface_definitions:
rm -f $(TMPL_DIR)/service/dns/node.def
rm -f $(TMPL_DIR)/protocols/node.def
- # Workaround for T604: vyos-1x: node.def generation always contains "type: txt"
- sed -i '/^type: txt/d' $(TMPL_DIR)/service/dns/forwarding/ignore-hosts-file/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/service/dns/forwarding/system/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/dynamic/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/noselect/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/preempt/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/prefer/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/allow-root/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/disable-host-validation/node.def
- sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/disable-password-authentication/node.def
-
.PHONY: all
all: interface_definitions