From 8dd733bf278e43ec093b486820f7f5cca86067b7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 23 Feb 2020 15:34:28 +0100 Subject: pppoe: T1318: de-nest pppoe interface --- debian/vyatta-cfg-qos.install | 1 + gen-interface-templates.pl | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/vyatta-cfg-qos.install b/debian/vyatta-cfg-qos.install index 48114e0..e91082e 100644 --- a/debian/vyatta-cfg-qos.install +++ b/debian/vyatta-cfg-qos.install @@ -11,6 +11,7 @@ opt/vyatta/share/vyatta-cfg/templates/interfaces/input opt/vyatta/share/vyatta-cfg/templates/interfaces/l2tpv3 opt/vyatta/share/vyatta-cfg/templates/interfaces/loopback opt/vyatta/share/vyatta-cfg/templates/interfaces/openvpn +opt/vyatta/share/vyatta-cfg/templates/interfaces/pppoe opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel opt/vyatta/share/vyatta-cfg/templates/interfaces/vti diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index ae4492c..167e074 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -30,9 +30,7 @@ my $debug = $ENV{'DEBUG'}; my %interface_hash = ( 'loopback/node.tag' => '$VAR(@)', 'ethernet/node.tag' => '$VAR(@)', - 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', - 'ethernet/node.tag/vif/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(@)', 'wireless/node.tag' => '$VAR(@)', @@ -40,6 +38,7 @@ my %interface_hash = ( 'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', 'bonding/node.tag/vif-s/node.tag' => '$VAR(../@).$VAR(@)', 'bonding/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../@).$VAR(../@).$VAR(@)', + 'pppoe/node.tag' => '$VAR(@)', 'pseudo-ethernet/node.tag' => '$VAR(@)', # 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', -- cgit v1.2.3