summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-05-07 22:42:48 +0200
committerChristian Poessinger <christian@poessinger.com>2018-05-07 22:42:48 +0200
commit2cd437d8717b8dfb5ea035b5bea8547da1275764 (patch)
treef84a38e600ba9e430d714339eb1dc4b450ee848a /Makefile
parentb50430e30aa4c5c387e7aaaaa893dfe1410c9be3 (diff)
parentdc815c27ebc76a55c0aa4bbabf42ed46a58f92ed (diff)
downloadvyos-1x-2cd437d8717b8dfb5ea035b5bea8547da1275764.tar.gz
vyos-1x-2cd437d8717b8dfb5ea035b5bea8547da1275764.zip
Merge branch 't623-ntp-rewrite' into current
* t623-ntp-rewrite: Switch to DNS hostnames for NTP servers T623: Rewrite NTP subsystem in new XML style interface definition
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index be271fe1e..ee89a5608 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,13 @@ 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"
+ # 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
.PHONY: all
all: interface_definitions