From 34d31abfb94afe4c9e71292bf207302d5fae71ea Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Sat, 4 Apr 2009 14:23:28 -0700
Subject: Move "commit" check out of invalid node.tag/node.def.

---
 templates/protocols/static/route/node.def          | 3 +++
 templates/protocols/static/route/node.tag/node.def | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates/protocols/static/route')

diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index 74cf3715..88c91801 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -2,3 +2,6 @@ tag:
 type: ipv4net
 help: Set a static route
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+
+commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \
+                   "Must add either a next-hop or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/route/node.tag/node.def b/templates/protocols/static/route/node.tag/node.def
index 7e15c498..f5c3f487 100644
--- a/templates/protocols/static/route/node.tag/node.def
+++ b/templates/protocols/static/route/node.tag/node.def
@@ -1,3 +1,2 @@
 help: Set IP network
-commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop or blackhole for route $VAR(@)"
 
-- 
cgit v1.2.3