diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-26 11:52:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-26 11:52:37 -0700 |
| commit | e10951fcd6cf58048209eb3a97ba5cacab4e8cb1 (patch) | |
| tree | 5a31adc0866e7f856493c9dd62827b9037aa2283 | |
| parent | 89faa9bc8c070f8c13b509d92b0c43c30ce980da (diff) | |
| parent | efc9e569b857025a3ca2c15c3b24acbc2cf14245 (diff) | |
| download | vyatta-cfg-quagga-e10951fcd6cf58048209eb3a97ba5cacab4e8cb1.tar.gz vyatta-cfg-quagga-e10951fcd6cf58048209eb3a97ba5cacab4e8cb1.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-quagga into jenner
| -rw-r--r-- | debian/changelog | 20 | ||||
| -rw-r--r-- | templates/protocols/ospf/passive-interface/node.def | 2 | ||||
| -rw-r--r-- | templates/protocols/rip/interface/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/ripng/interface/node.def | 4 |
4 files changed, 25 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index e5dbc2d5..9551ca41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +vyatta-cfg-quagga (0.18.1) unstable; urgency=low + + * Change "rip/ripng interface" check from "syntax" to "commit". + + -- Stig Thormodsrud <stig@vyatta.com> Wed, 25 Mar 2009 18:18:22 -0700 + +vyatta-cfg-quagga (0.18.0) unstable; urgency=low + + * Start ipv6 daemons as needed during ospf/rip config + * Generate interface templates as part of build + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 25 Mar 2009 14:47:53 -0700 + +vyatta-cfg-quagga (0.17.11) unstable; urgency=low + + * Change "syntax" to "commit" check for "protocol ospf passive- + interace" + + -- Stig Thormodsrud <stig@vyatta.com> Tue, 24 Mar 2009 18:26:35 -0700 + vyatta-cfg-quagga (0.17.10) unstable; urgency=low * Enable link filtering diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index 9db0aca8..d82edd03 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -2,7 +2,7 @@ multi: type: txt help: Set to suppress routing updates on an interface -syntax:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl \ +commit:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl \ --check all --dev $VAR(@) 2> /dev/null || \ [ x$VAR(@) == xdefault ]"; \ "$VAR(@) is not 'default' or a known interface name" diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def index 1cbbdaac..3d939ffd 100644 --- a/templates/protocols/rip/interface/node.def +++ b/templates/protocols/rip/interface/node.def @@ -1,9 +1,9 @@ multi: type: txt help: Set interface name -syntax:expression: exec " \ +commit:expression: exec " \ if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \ - echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \ + echo interface $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " create:vyatta-vtysh -c "configure terminal" -c "router rip" -c "network $VAR(@)" diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def index 3a967735..e55355f4 100644 --- a/templates/protocols/ripng/interface/node.def +++ b/templates/protocols/ripng/interface/node.def @@ -2,9 +2,9 @@ multi: type: txt help: Set interface name allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all -syntax:expression: exec " \ +commit:expression: exec " \ if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \ - echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \ + echo interface $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ fi ; " |