From efd76fb5e3e262c971fa9503fd84dcedd8a46c97 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 17 Apr 2009 15:02:26 -0700
Subject: Bugfix 4275: Don't allow user to configure link-detect on PPP
 interfaces.

---
 gen-interface-templates.pl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
index 5e17fa0c..c008b991 100755
--- a/gen-interface-templates.pl
+++ b/gen-interface-templates.pl
@@ -31,25 +31,19 @@ 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 {
-- 
cgit v1.2.3