summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@uffda.(none)>2007-10-22 17:37:30 -0700
committerStig Thormodsrud <stig@uffda.(none)>2007-10-22 17:37:30 -0700
commit9e664b053f5537e124a00b6023a69dea5b712fcc (patch)
treed2a29402433d453d9261a181ddf9e8fc2db3862c
parent12c3f0bab9e81b09828c7bd1cd99cfe0ae7d6dab (diff)
downloadvyatta-cfg-quagga-9e664b053f5537e124a00b6023a69dea5b712fcc.tar.gz
vyatta-cfg-quagga-9e664b053f5537e124a00b6023a69dea5b712fcc.zip
Fix bgp redistribute *.
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/connected/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/ospf/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/rip/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/static/node.def4
5 files changed, 10 insertions, 10 deletions
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
index 4059a007..32b65d98 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
@@ -1,6 +1,6 @@
help: "Redistribute connected routes"
delete: "touch /tmp/bgp-redist-connected.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no redistribute connected \"; \
if [ -f \"/tmp/bgp-redist-connected.\\$PPID\" ]; then \
rm -rf /tmp/bgp-redist-connected.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
if [ -n \"$(./route-map/@)\" ]; then \
COND=\"\\$COND route-map $(./route-map/@)\"; \
fi; \
- /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+ /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"redistribute connected \\$COND\"; \
fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
index 82d3e753..6c270552 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
help: "Redistribute kernel routes"
delete: "touch /tmp/bgp-redist-kernel.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no redistribute kernel \"; \
if [ -f \"/tmp/bgp-redist-kernel.\\$PPID\" ]; then \
rm -rf /tmp/bgp-redist-kernel.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
if [ -n \"$(./route-map/@)\" ]; then \
COND=\"\\$COND route-map $(./route-map/@)\"; \
fi; \
- /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+ /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"redistribute kernel \\$COND\"; \
fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
index 867d940f..34ce3597 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
help: "Redistribute OSPF routes"
delete: "touch /tmp/bgp-redist-ospf.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no redistribute ospf \"; \
if [ -f \"/tmp/bgp-redist-ospf.\\$PPID\" ]; then \
rm -rf /tmp/bgp-redist-ospf.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
if [ -n \"$(./route-map/@)\" ]; then \
COND=\"\\$COND route-map $(./route-map/@)\"; \
fi; \
- /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+ /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"redistribute ospf \\$COND\"; \
fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
index cb6aa119..6681b909 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
@@ -1,6 +1,6 @@
help: "Redistribute RIP routes"
delete: "touch /tmp/bgp-redist-rip.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no redistribute rip \"; \
if [ -f \"/tmp/bgp-redist-rip.\\$PPID\" ]; then \
rm -rf /tmp/bgp-redist-rip.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
if [ -n \"$(./route-map/@)\" ]; then \
COND=\"\\$COND route-map $(./route-map/@)\"; \
fi; \
- /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+ /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"redistribute rip \\$COND\"; \
fi; "
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def
index 9c66fe93..eeeb6fa1 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def
@@ -1,6 +1,6 @@
help: "Redistribute static routes"
delete: "touch /tmp/bgp-redist-static.\\$PPID"
-end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"no redistribute static \"; \
if [ -f \"/tmp/bgp-redist-static.\\$PPID\" ]; then \
rm -rf /tmp/bgp-redist-static.\\$PPID; \
@@ -11,6 +11,6 @@ end: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
if [ -n \"$(./route-map/@)\" ]; then \
COND=\"\\$COND route-map $(./route-map/@)\"; \
fi; \
- /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../@)\" \
+ /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-c \"redistribute static \\$COND\"; \
fi; "