diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-11-29 15:57:22 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-11-29 15:57:22 -0800 |
| commit | fa38551031d0a0e37663fe465b3847f652b2c5a4 (patch) | |
| tree | d9ed74d33ea3d773cb89a19955190857c64a9756 /templates/show/firewall/ipv6-name | |
| parent | e95a1384c6d0ac25e41b3b201e5524c0488e3714 (diff) | |
| download | vyatta-op-firewall-fa38551031d0a0e37663fe465b3847f652b2c5a4.tar.gz vyatta-op-firewall-fa38551031d0a0e37663fe465b3847f652b2c5a4.zip | |
Fix 5163: 'show firewall' displays misleading output when firewall groups are used
Replace "show firewall" with "show firewall detail" output.
Diffstat (limited to 'templates/show/firewall/ipv6-name')
7 files changed, 3 insertions, 17 deletions
diff --git a/templates/show/firewall/ipv6-name/detail/node.def b/templates/show/firewall/ipv6-name/detail/node.def deleted file mode 100644 index 5fb43bc..0000000 --- a/templates/show/firewall/ipv6-name/detail/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Show detailed firewall information -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl diff --git a/templates/show/firewall/ipv6-name/node.def b/templates/show/firewall/ipv6-name/node.def index b14bdec..ffd322d 100644 --- a/templates/show/firewall/ipv6-name/node.def +++ b/templates/show/firewall/ipv6-name/node.def @@ -1,2 +1,2 @@ help: Show IPv6 firewall chains -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall.xsl +run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl diff --git a/templates/show/firewall/ipv6-name/node.tag/detail/node.def b/templates/show/firewall/ipv6-name/node.tag/detail/node.def deleted file mode 100644 index 6ef355e..0000000 --- a/templates/show/firewall/ipv6-name/node.tag/detail/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Show detailed IPv6 firewall rules information - -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl diff --git a/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.def b/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.def deleted file mode 100644 index 345643e..0000000 --- a/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Show detailed IPv6 firewall rules information diff --git a/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.tag/node.def b/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.tag/node.def deleted file mode 100644 index c231a40..0000000 --- a/templates/show/firewall/ipv6-name/node.tag/detail/rule/node.tag/node.def +++ /dev/null @@ -1,8 +0,0 @@ -help: Show detailed information for specified IPv6 firewall rule - -allowed: local -a vals - eval "vals=($(cli-shell-api listActiveNodes \ - firewall ipv6-name ${COMP_WORDS[COMP_CWORD-3]} rule))" - echo -n ${vals[@]} - -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$7" diff --git a/templates/show/firewall/ipv6-name/node.tag/node.def b/templates/show/firewall/ipv6-name/node.tag/node.def index 50597fa..d29ceed 100644 --- a/templates/show/firewall/ipv6-name/node.tag/node.def +++ b/templates/show/firewall/ipv6-name/node.tag/node.def @@ -4,4 +4,4 @@ allowed: local -a vals eval "vals=($(cli-shell-api listActiveNodes firewall ipv6-name))" echo -n ${vals[@]} -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall.xsl +run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl diff --git a/templates/show/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/show/firewall/ipv6-name/node.tag/rule/node.tag/node.def index ee73ee7..512f038 100644 --- a/templates/show/firewall/ipv6-name/node.tag/rule/node.tag/node.def +++ b/templates/show/firewall/ipv6-name/node.tag/rule/node.tag/node.def @@ -5,4 +5,4 @@ allowed: local -a vals firewall ipv6-name ${COMP_WORDS[COMP_CWORD-2]} rule))" echo -n ${vals[@]} -run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall.xsl "$6" +run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$6" |