summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@io.vyatta.com>2009-02-25 14:28:51 -0800
committerStig Thormodsrud <stig@io.vyatta.com>2009-02-25 14:28:51 -0800
commit068853566c433d230b731c53a2363d569096f4b7 (patch)
tree93d3bbfd5285f99fee3090733a2a4dc828fc1f35 /templates
parent505178511ac1d12e1aab6c08d6a02e983bbb0535 (diff)
parent6b57dcc5d252cc91505dab1fdd35b35ad4da4150 (diff)
downloadvyatta-cfg-quagga-068853566c433d230b731c53a2363d569096f4b7.tar.gz
vyatta-cfg-quagga-068853566c433d230b731c53a2363d569096f4b7.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-quagga into jenner
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/bgp/node.def2
-rw-r--r--templates/protocols/ospf/node.def2
-rw-r--r--templates/protocols/ospfv3/node.def8
-rw-r--r--templates/protocols/rip/node.def2
-rw-r--r--templates/protocols/ripng/node.def4
5 files changed, 9 insertions, 9 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 91d7261b..7f7e393f 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -5,7 +5,7 @@ comp_help: \1 <1-4294967294>\tAS number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
"AS number must be between 1 and 4294967294"
create: sudo /opt/vyatta/sbin/quagga-manager start bgpd
-update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
# we need to set default parameters in BGP here since we can't do it in
# startup scripts as we don't know the AS number at that point
update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index 1fd39bfe..dfae4396 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,5 +1,5 @@
help: Configure Open Shortest Path First protocol (OSPF) parameters
create: sudo /opt/vyatta/sbin/quagga-manager start ospfd
-create: vyatta-vtysh -c "configure terminal" -c "router ospf"
+ vyatta-vtysh -c "configure terminal" -c "router ospf"
delete: vyatta-vtysh -c "configure terminal" -c "no router ospf"
end: sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def
index 65963f46..3cdcd17e 100644
--- a/templates/protocols/ospfv3/node.def
+++ b/templates/protocols/ospfv3/node.def
@@ -1,5 +1,5 @@
help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf6\" "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"no router ospf6\" "
+create: sudo /opt/vyatta/sbin/quagga-manager start ospf6d
+ vyatta-vtysh -c configure terminal" -c "router ospf6"
+delete:vyatta-vtysh -c "configure terminal" -c "no router ospf6"
+end: sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index 648ecf49..31f915c1 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,5 +1,5 @@
help: Configure Routing Information Protocol (RIP) parameters
create: sudo /opt/vyatta/sbin/quagga-manager start ripd
-create: vyatta-vtysh -c "configure terminal" -c "router rip"
+ vyatta-vtysh -c "configure terminal" -c "router rip"
delete: vyatta-vtysh -c "configure terminal" -c "no router rip"
end: sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index a4c4c9d4..9b0d1f5b 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,5 +1,5 @@
help: Configure Routing Information Protocol (RIPng) parameters
-begin: sudo /opt/vyatta/sbin/quagga-manager start ripngd
-create: vyatta-vtysh -c "configure terminal" -c "router ripng"
+create: sudo /opt/vyatta/sbin/quagga-manager start ripngd
+ vyatta-vtysh -c "configure terminal" -c "router ripng"
delete: vyatta-vtysh -c "configure terminal" -c "no router ripng"
end: sudo /opt/vyatta/sbin/quagga-manager update