diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-02-23 15:34:46 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-02-23 15:34:46 +0100 |
| commit | 1a13654cbab4101f343d3522d99d96227e14a867 (patch) | |
| tree | 8ee4bd05d4435399e6af313e8c50b6aa8c3f30ed | |
| parent | cdfd8c78119d5c8cac352b06bfaa1dc8d48537c2 (diff) | |
| download | vyatta-cfg-quagga-1a13654cbab4101f343d3522d99d96227e14a867.tar.gz vyatta-cfg-quagga-1a13654cbab4101f343d3522d99d96227e14a867.zip | |
pppoe: T1318: de-nest pppoe interface
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg-quagga.install | 1 | ||||
| -rwxr-xr-x | gen-interface-templates.pl | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/compat b/debian/compat index 7ed6ff82..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install index 8bb25cc1..24f1d536 100644 --- a/debian/vyatta-cfg-quagga.install +++ b/debian/vyatta-cfg-quagga.install @@ -9,6 +9,7 @@ opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet 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 ef8c0a3a..937af0b7 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -31,13 +31,12 @@ 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-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/pppoe/node.tag' => 'pppoe$VAR(@)', 'wireless/node.tag' => '$VAR(@)', 'wireless/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', + 'pppoe/node.tag' => '$VAR(@)', 'pseudo-ethernet/node.tag' => '$VAR(@)', 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', 'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../@).$VAR(@)', |