summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-20 08:29:57 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-04-20 08:29:57 -0700
commitfa7c059df5c2c596ed94a6e4798ba121bf3009c2 (patch)
tree79c9d2ab8dccc2a51b6d63191684767e70728586
parent941d037ab7a4fcdcf2376311eab185195fc2d180 (diff)
downloadvyatta-cfg-quagga-fa7c059df5c2c596ed94a6e4798ba121bf3009c2.tar.gz
vyatta-cfg-quagga-fa7c059df5c2c596ed94a6e4798ba121bf3009c2.zip
Revert "Bugfix 4275: Don't allow user to configure link-detect on PPP interfaces."
This reverts commit efd76fb5e3e262c971fa9503fd84dcedd8a46c97.
-rwxr-xr-xgen-interface-templates.pl6
1 files changed, 6 insertions, 0 deletions
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
index c008b991..5e17fa0c 100755
--- a/gen-interface-templates.pl
+++ b/gen-interface-templates.pl
@@ -31,19 +31,25 @@ 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(@)',
'bonding/node.tag' => '$VAR(@)',
'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)',
'tunnel/node.tag' => '$VAR(@)',
'bridge/node.tag' => '$VAR(@)',
'openvpn/node.tag' => '$VAR(@)',
'wirelessmodem/node.tag' => '$VAR(@)',
+ 'multilink/node.tag/vif/node.tag' => '$VAR(../@)',
'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../@)',
'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => '$VAR(../../@)',
'serial/node.tag/cisco-hdlc/vif/node.tag' => '$VAR(../../@).$VAR(@)',
'serial/node.tag/frame-relay/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+ 'serial/node.tag/ppp/vif/node.tag' => '$VAR(../../@).$VAR(@)',
);
sub gen_template {