summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-04-15 18:24:05 +0200
committerChristian Poessinger <christian@poessinger.com>2018-04-15 18:24:05 +0200
commitaf31124beacb0c9f4c5798236376b0298a79f1fc (patch)
treee75721244dbccfd30aa2345f1940529c2e66a29c /Makefile
parentbdda9e84e55d80fafc7cd115d7beb858d4a1a00d (diff)
parent7ca3c19b574d31adcd5f6c962e4177f43fb17f7b (diff)
downloadvyos-1x-af31124beacb0c9f4c5798236376b0298a79f1fc.tar.gz
vyos-1x-af31124beacb0c9f4c5798236376b0298a79f1fc.zip
Merge branch 'powerdns-recursor' into current
* powerdns-recursor: Update debian/changelog - 1.0.4 Makefile: Fix for special nodes not requiring have any 'type' field dns-forwarding: XML: fix indention dns-forwarding: add completion helper for dhcp T560: dns-forwarding: replace dnsmasq with pdns-recursor dns-forwarding: XML: Bugfix DNS domain forward configuration nodes dns-forwarding.py: add missing 'query-all-servers' path Initial working version for XML interface to configure dnsmasq Initial CLI interface support for XML DNS forwarder
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f5800da43..55f5cb876 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,13 @@ interface_definitions:
# XXX: delete top level node.def's that now live in other packages
rm -f $(TMPL_DIR)/system/node.def
rm -f $(TMPL_DIR)/service/node.def
+ 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