summaryrefslogtreecommitdiff
path: root/gen-interface-templates.pl
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-02-23 15:34:11 +0100
committerChristian Poessinger <christian@poessinger.com>2020-02-23 15:34:11 +0100
commit1c1e2e389c556a27097002315bf69ce0adcbab29 (patch)
treecf25dde83a81592225bea3049a58f669a6c525dd /gen-interface-templates.pl
parent7df0ec923088674e812af574243e83e8245fc650 (diff)
downloadvyatta-cfg-firewall-1c1e2e389c556a27097002315bf69ce0adcbab29.tar.gz
vyatta-cfg-firewall-1c1e2e389c556a27097002315bf69ce0adcbab29.zip
pppoe: T1318: de-nest pppoe interface
Diffstat (limited to 'gen-interface-templates.pl')
-rwxr-xr-xgen-interface-templates.pl6
1 files changed, 2 insertions, 4 deletions
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
index b1b0a01..9e8db61 100755
--- a/gen-interface-templates.pl
+++ b/gen-interface-templates.pl
@@ -43,15 +43,14 @@ my %interface_hash = (
'bridge/node.tag' => '$VAR(../../../@)',
'dummy/node.tag' => '$VAR(../../../@)',
'ethernet/node.tag' => '$VAR(../../../@)',
- 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)',
'ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)',
'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(../../../@)',
'input/node.tag' => '$VAR(../../../@)',
'l2tpv3/node.tag' => '$VAR(../../../@)',
'multilink/node.tag/vif/node.tag' => '$VAR(../../../../@)',
'openvpn/node.tag' => '$VAR(../../../@)',
+ 'pppoe/node.tag' => '$VAR(../../../@)',
'pseudo-ethernet/node.tag' => '$VAR(../../../@)',
'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)',
'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../../@).$VAR(../../../../@).$VAR(../../../@)',
@@ -74,15 +73,14 @@ my %firewall_hash = (
'bridge/node.tag' => 'bridge $VAR(../@)',
'dummy/node.tag' => 'dummy $VAR(../@)',
'ethernet/node.tag' => 'ethernet $VAR(../@)',
- 'ethernet/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../@) pppoe $VAR(../@)',
'ethernet/node.tag/vif-s/node.tag' => 'ethernet $VAR(../../../@) vif-s $VAR(../@)',
'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(../@)',
'input/node.tag' => 'input $VAR(../@)',
'l2tpv3/node.tag' => 'l2tpv3 $VAR(../@)',
'multilink/node.tag/vif/node.tag' => 'multilink $VAR(../../../@) vif $VAR(../@)',
'openvpn/node.tag' => 'openvpn $VAR(../@)',
+ 'pppoe/node.tag' => 'pppoe $VAR(../@)',
'pseudo-ethernet/node.tag' => 'pseudo-ethernet $VAR(../@)',
'pseudo-ethernet/node.tag/vif-s/node.tag' => 'pseudo-ethernet $VAR(../../../@) vif-s $VAR(../@)',
'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'pseudo-ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)',