summaryrefslogtreecommitdiff
path: root/templates/protocols/static
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-04-30 12:20:49 -0700
committerStig Thormodsrud <stig@vyatta.com>2008-04-30 12:20:49 -0700
commitc287856f6c24d3ee410c6837785ab2914341603d (patch)
tree13d720aff63270b6c6691327ae10d1cd9fc62c2b /templates/protocols/static
parentc8fecfb40e0e65823f3429e0f4787bcef4109c8c (diff)
downloadvyatta-cfg-quagga-c287856f6c24d3ee410c6837785ab2914341603d.tar.gz
vyatta-cfg-quagga-c287856f6c24d3ee410c6837785ab2914341603d.zip
Fix 3199: removed redundant "static interface-route blackhole"
Diffstat (limited to 'templates/protocols/static')
-rw-r--r--templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def4
-rw-r--r--templates/protocols/static/interface-route/node.tag/blackhole/node.def11
-rw-r--r--templates/protocols/static/interface-route/node.tag/node.def3
3 files changed, 2 insertions, 16 deletions
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
deleted file mode 100644
index 08a06ad8..00000000
--- a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Set distance value for this route
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
-comp_help: <1-255> Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
deleted file mode 100644
index aaeab5b6..00000000
--- a/templates/protocols/static/interface-route/node.tag/blackhole/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set to silently discard pkts when matched
-delete:expression: "touch /tmp/static.$PPID"
-end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
- rm /tmp/static.$PPID; \
- else \
- if [ -n \"$VAR(./distance/@)\" ]; then \
- DIST=\"$VAR(./distance/@)\"; \
- fi; \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) null0 $DIST \" ; \
- fi; "
diff --git a/templates/protocols/static/interface-route/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/node.def
index 21624367..1bc36220 100644
--- a/templates/protocols/static/interface-route/node.tag/node.def
+++ b/templates/protocols/static/interface-route/node.tag/node.def
@@ -1,2 +1,3 @@
help: Set IP network
-commit:expression: $VAR(./next-hop-interface/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop-interface or blackhole for route $VAR(@)"
+commit:expression: $VAR(./next-hop-interface/) != "" ; \
+ "Must add a next-hop-interface for route $VAR(@)"