diff options
| author | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 14:57:20 -0700 |
|---|---|---|
| committer | susheela <susheela.vaidya@vyatta.com> | 2012-10-06 14:57:20 -0700 |
| commit | 5df406f84ec7e1567d813e7b0d1e264a12e3cd06 (patch) | |
| tree | 8d4c16cdd8c15f2604d62ad5fd32f440ba9041a4 /scripts | |
| parent | dc8309dfb4ad12a5a1654952a2058db2850108d5 (diff) | |
| download | vyatta-op-firewall-5df406f84ec7e1567d813e7b0d1e264a12e3cd06.tar.gz vyatta-op-firewall-5df406f84ec7e1567d813e7b0d1e264a12e3cd06.zip | |
PBR op commands: a clean up and fixes for 8349, 8334
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/firewall/vyatta-clear-firewall | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/firewall/vyatta-clear-firewall b/scripts/firewall/vyatta-clear-firewall index 46f6b04..0e217e5 100644 --- a/scripts/firewall/vyatta-clear-firewall +++ b/scripts/firewall/vyatta-clear-firewall @@ -33,7 +33,7 @@ clear_chain() { sudo $iptables_cmd -t $table_name -Z $chain_name 2>/dev/null result=`echo $?` if [ $result != 0 ]; then - echo Invalid $ip_version firewall $cli_tree chain \'$chain_name\' + echo Invalid $ip_version $cli_root $cli_tree instance \'$chain_name\' exit 1 fi } @@ -42,7 +42,7 @@ clear_chain_rule() { result=`sudo $iptables_cmd -t $table_name -L $chain_name 2>/dev/null` result=`echo $?` if [ $result != 0 ]; then - echo Invalid $ip_version firewall $cli_tree chain \'$chain_name\' + echo Invalid $ip_version $cli_root $cli_tree instance \'$chain_name\' exit 1 else iptables_rule_num=( `sudo $iptables_cmd -t $table_name -L $chain_name \ @@ -55,7 +55,7 @@ clear_chain_rule() { let i++ done else - echo No \'rule $rule_num\' under $ip_version firewall $cli_tree chain \'$chain_name\' + echo No \'rule $rule_num\' under $ip_version $cli_root $cli_tree instance \'$chain_name\' exit 1 fi fi @@ -76,13 +76,15 @@ chain_name=$3 rule_num=$4 ip_version="IPv4" cli_tree="name" +cli_root="firewall" if [[ '/sbin/ip6tables' =~ $iptables_cmd ]]; then ip_version="IPv6" fi if [[ 'mangle' =~ $table_name ]]; then - cli_tree="modify" + cli_root="policy" + cli_tree="route" fi if [ -n "$rule_num" ]; then |