diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-21 19:20:26 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-21 19:20:26 -0700 |
| commit | 656ec94bd6163330712aaf5791da4daa514a54bd (patch) | |
| tree | 8e62770e917c1a81f79a0e975f0f70e813b6c3a2 | |
| parent | 118e7d45548393ded207cc401ae5a3fd22c5ec02 (diff) | |
| parent | e48f9aa31bda6349c0f5e53ea15df00869f73cec (diff) | |
| download | vyatta-cfg-quagga-656ec94bd6163330712aaf5791da4daa514a54bd.tar.gz vyatta-cfg-quagga-656ec94bd6163330712aaf5791da4daa514a54bd.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-quagga into jenner
| -rw-r--r-- | templates/protocols/bgp/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/ospf/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/ospfv3/node.def | 6 | ||||
| -rw-r--r-- | templates/protocols/rip/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/ripng/node.def | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 7548ad6d..8e21f914 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -4,8 +4,8 @@ help: Configure Border Gateway Protocol (BGP) parameters 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 - vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" +begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd +create: 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 555e9dba..639eb2bc 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,4 +1,4 @@ help: Configure Open Shortest Path First protocol (OSPF) parameters -create: sudo /opt/vyatta/sbin/quagga-manager start ospfd - vyatta-vtysh -c "configure terminal" -c "router ospf" +begin: sudo /opt/vyatta/sbin/quagga-manager start ospfd +create: vyatta-vtysh -c "configure terminal" -c "router ospf" delete: vyatta-vtysh -c "configure terminal" -c "no router ospf" diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def index e1549441..ed48a66c 100644 --- a/templates/protocols/ospfv3/node.def +++ b/templates/protocols/ospfv3/node.def @@ -1,4 +1,4 @@ help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters -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" +begin: sudo /opt/vyatta/sbin/quagga-manager start ospf6d +create: vyatta-vtysh -c "configure terminal" -c "router ospf6" +delete: vyatta-vtysh -c "configure terminal" -c "no router ospf6" diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def index 05cf72b1..161b883f 100644 --- a/templates/protocols/rip/node.def +++ b/templates/protocols/rip/node.def @@ -1,4 +1,4 @@ help: Configure Routing Information Protocol (RIP) parameters -create: sudo /opt/vyatta/sbin/quagga-manager start ripd - vyatta-vtysh -c "configure terminal" -c "router rip" +begin: sudo /opt/vyatta/sbin/quagga-manager start ripd +create: vyatta-vtysh -c "configure terminal" -c "router rip" delete: vyatta-vtysh -c "configure terminal" -c "no router rip" diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def index ed2c163f..6903c07e 100644 --- a/templates/protocols/ripng/node.def +++ b/templates/protocols/ripng/node.def @@ -1,4 +1,4 @@ help: Configure Routing Information Protocol (RIPng) parameters -create: sudo /opt/vyatta/sbin/quagga-manager start ripngd - vyatta-vtysh -c "configure terminal" -c "router ripng" +begin: sudo /opt/vyatta/sbin/quagga-manager start ripngd +create: vyatta-vtysh -c "configure terminal" -c "router ripng" delete: vyatta-vtysh -c "configure terminal" -c "no router ripng" |