summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-04-15 17:44:49 +0200
committerChristian Poessinger <christian@poessinger.com>2018-04-15 17:50:58 +0200
commit67a5103c939fd8779805ff0c1778504125d63eee (patch)
treeb80c5e7891527cc4e7ae57e2b02d83841537209a
parentde25f875242b5fb807c906cc0219aa6d045e2468 (diff)
downloadvyos-1x-67a5103c939fd8779805ff0c1778504125d63eee.tar.gz
vyos-1x-67a5103c939fd8779805ff0c1778504125d63eee.zip
Makefile: Fix for special nodes not requiring have any 'type' field
... this is due to the fact that the XML generator will always add "type: txt" to node.def files if no other type has been especially defined. This will break the following commands * set service dns forwarding system * set service dns forwarding ignore-hosts-file because they will now have "type: txt" in their node.def file and this will break the CLI commands. "type: txt" requires an argument but those nodes did not in the past.
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index de7c136eb..55f5cb876 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ interface_definitions:
rm -f $(TMPL_DIR)/service/dns/node.def
rm -f $(TMPL_DIR)/protocols/node.def
+ # Workaround for special nodes that should not have "type: txt"
+ sed -i '/^type: txt/d' $(TMPL_DIR)/service/dns/forwarding/listen-on/node.def
+ sed -i '/^type: txt/d' $(TMPL_DIR)/service/dns/forwarding/system/node.def
+
.PHONY: all
all: interface_definitions