diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-07-24 09:36:35 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-07-24 09:36:35 +0200 |
| commit | 2e322c7a839ceac87fe03fb75e180e882e0bc5f7 (patch) | |
| tree | 7f13f5425ef27a9f641a786154dc98397053b466 | |
| parent | 1f010c0a0d4ae6e4f37d9f71d0e97df2fc44b999 (diff) | |
| download | vyatta-cfg-firewall-2e322c7a839ceac87fe03fb75e180e882e0bc5f7.tar.gz vyatta-cfg-firewall-2e322c7a839ceac87fe03fb75e180e882e0bc5f7.zip | |
T666: remove the firewall option from the old VRRP CLI.
If left in place, it will create incorrect command definition tree
when vyatta-vrrp is removed and cause config loading errors.
| -rwxr-xr-x | gen-interface-policy-templates.pl | 1 | ||||
| -rwxr-xr-x | gen-interface-templates.pl | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/gen-interface-policy-templates.pl b/gen-interface-policy-templates.pl index a86c5d6..ed5ff22 100755 --- a/gen-interface-policy-templates.pl +++ b/gen-interface-policy-templates.pl @@ -48,7 +48,6 @@ my %interface_hash = ( 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', - 'ethernet/node.tag/vrrp/vrrp-group/node.tag' => '$VAR(../../../../@)v$VAR(../../@)', 'input/node.tag' => '$VAR(../../@)', 'l2tpv3/node.tag' => '$VAR(../../@)', 'multilink/node.tag/vif/node.tag' => '$VAR(../../../@)', diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index ceabc6e..4451998 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -48,7 +48,6 @@ my %interface_hash = ( 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../../@).$VAR(../../../../@).$VAR(../../../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', - 'ethernet/node.tag/vrrp/vrrp-group/node.tag' => '$VAR(../../../../../@)v$VAR(../../../@)', 'input/node.tag' => '$VAR(../../../@)', 'l2tpv3/node.tag' => '$VAR(../../../@)', 'multilink/node.tag/vif/node.tag' => '$VAR(../../../../@)', @@ -79,7 +78,6 @@ my %firewall_hash = ( 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', 'ethernet/node.tag/vif/node.tag' => 'ethernet $VAR(../../../@) vif $VAR(../@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../../../@) vif $VAR(../../@) pppoe $VAR(../@)', - 'ethernet/node.tag/vrrp/vrrp-group/node.tag' => 'ethernet $VAR(../../../@) vrrp vrrp-group $VAR(../@)', 'input/node.tag' => 'input $VAR(../@)', 'l2tpv3/node.tag' => 'l2tpv3 $VAR(../@)', 'multilink/node.tag/vif/node.tag' => 'multilink $VAR(../../../@) vif $VAR(../@)', |