summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-06-24 11:30:34 +0200
committerChristian Poessinger <christian@poessinger.com>2018-06-24 11:32:58 +0200
commit4e3098b5e7b324b8f610e25be60855b7109b2ef2 (patch)
tree270ece868b9f85f851d3fab7e2efb876b87d8af8 /Makefile
parent4c6282a43bc1a2ddfe690eef88536cfcd2b88535 (diff)
parent24d68047640a715ecf63d19e5716e2d492faec5b (diff)
downloadvyos-1x-4e3098b5e7b324b8f610e25be60855b7109b2ef2.tar.gz
vyos-1x-4e3098b5e7b324b8f610e25be60855b7109b2ef2.zip
Merge remote-tracking branch 'hagbard/current' into current
* commit 'hagbard/current': T201: - set <valueless/> since only create and delete is required T201: avoid node.def creation which conflicts with vyatta-cfg-system emoved enable and disabled, as per Christians note. removed enable and disable, which is not really required. T201 implmntation, it depends on the beep pacakge added in vyos-build
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 84cc8fa90..50710af47 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ 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)/system/options/node.def
rm -f $(TMPL_DIR)/service/node.def
rm -f $(TMPL_DIR)/service/dns/node.def
rm -f $(TMPL_DIR)/protocols/node.def