diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:01:30 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:01:30 -0700 |
| commit | 918fd7e1d19554575963fd02a3c80d0e5b49c833 (patch) | |
| tree | 3803737f6a841a4fcec777a9ec6fc95788ebecd2 | |
| parent | c0b0c19ac8ccbddde19cbf0b3a7b8cf4369d29a2 (diff) | |
| parent | 418137959785444770757ee14add716e563f5248 (diff) | |
| download | vyatta-cfg-quagga-918fd7e1d19554575963fd02a3c80d0e5b49c833.tar.gz vyatta-cfg-quagga-918fd7e1d19554575963fd02a3c80d0e5b49c833.zip | |
Merge branch 'glendale' into hollywood
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | templates/protocols/ospf/auto-cost/reference-bandwidth/node.def | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/debian/control b/debian/control index 88f72341..964e18b8 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Standards-Version: 3.7.2 Package: vyatta-cfg-quagga Architecture: all -Depends: bash (>= 3.1), - sed (>= 4.1.5), +Depends: sed (>= 4.1.5), perl (>= 5.8.8), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), vyatta-cfg, + vyatta-bash, vyatta-quagga | quagga Suggests: util-linux (>= 2.13-5), net-tools, diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def index b6f5565c..9896730d 100644 --- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def +++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def @@ -3,15 +3,20 @@ help: Use reference bandwidth method to assign OSPF cost default: 100 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \ "Must be between 1-4294967" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ -c \"configure terminal\" \ -c \"router ospf\" \ - -c \"auto-cost reference-bandwidth $VAR(@) \"; " + -c \"auto-cost reference-bandwidth $VAR(@) \"; \ + echo 'OSPF: Reference bandwidth is changed.'; \ + echo ' Please ensure reference bandwidth is consistent across all routers'; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ -c \"configure terminal\" \ -c \"router ospf\" \ - -c \"no auto-cost reference-bandwidth \"; " + -c \"no auto-cost reference-bandwidth \"; \ + echo 'OSPF: Reference bandwidth is changed.'; \ + echo ' Please ensure reference bandwidth is consistent across all routers'; " comp_help: possible completions: <1-4294967> Set reference bandwidth cost in Mbits/sec (default 100) |