diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-10 14:22:15 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-10 14:22:15 -0800 |
| commit | 7e26c87ea72f5f92121512e49d9adfb2bcc4c2e9 (patch) | |
| tree | 9d2733fb4dc17cf6788770fc574451dbf92fe077 | |
| parent | 31747ed42038d00499099d11abf1e33b3ef7c26f (diff) | |
| parent | bf45a5419e40a867c7d5e4d9a819dbe524246196 (diff) | |
| download | vyatta-cfg-7e26c87ea72f5f92121512e49d9adfb2bcc4c2e9.tar.gz vyatta-cfg-7e26c87ea72f5f92121512e49d9adfb2bcc4c2e9.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 4 | ||||
| -rw-r--r-- | templates/priority | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 41a8ffb..4a517e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-cfg (0.14.12) unstable; urgency=low + + [ Stig Thormodsrud ] + * Force firewall group to be configured before firewall. + + [ Stephen Hemminger ] + * Change order of config load + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Sun, 08 Feb 2009 15:47:06 -0800 + vyatta-cfg (0.14.11) unstable; urgency=low * Move config reload from quagga to vyatta-cfg diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index 369ef7a..5589d69 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -333,6 +333,10 @@ exit () # run op mode commands run () { + if [ $# == 0 ]; then + echo Incomplete command + return 1 + fi _vyatta_op_run $@ } diff --git a/templates/priority b/templates/priority index 4e9d982..02db178 100644 --- a/templates/priority +++ b/templates/priority @@ -11,8 +11,8 @@ 400 system 450 protocols/static 470 policy -510 protocols/bgp/node.tag/neighbor/node.tag -520 protocols/bgp/node.tag/parameters +510 protocols/bgp/node.tag/parameters +520 protocols/bgp/node.tag/neighbor/node.tag 530 protocols/bgp 600 protocols/ospf/parameters 610 protocols/ospf |