diff options
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/vyatta-cfg-firewall.install | 2 | ||||
| -rwxr-xr-x | gen-interface-policy-templates.pl | 2 | ||||
| -rwxr-xr-x | gen-interface-templates.pl | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/debian/control b/debian/control index 1b5f4d4..9ea52d6 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,7 @@ Depends: sed (>= 4.1.5), libswitch-perl, libsnmp-perl Replaces: vyatta-cfg-system, - vyatta-openvpn, - vyatta-wirelessmodem + vyatta-openvpn Suggests: util-linux (>= 2.13-5), net-tools, ethtool, diff --git a/debian/vyatta-cfg-firewall.install b/debian/vyatta-cfg-firewall.install index 40f05db..e4844fb 100644 --- a/debian/vyatta-cfg-firewall.install +++ b/debian/vyatta-cfg-firewall.install @@ -15,7 +15,7 @@ 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 opt/vyatta/share/vyatta-cfg/templates/interfaces/wireless -opt/vyatta/share/vyatta-cfg/templates/interfaces/wirelessmodem +opt/vyatta/share/vyatta-cfg/templates/interfaces/wwan opt/vyatta/share/vyatta-cfg/templates/interfaces/l2tpv3 opt/vyatta/share/vyatta-cfg/templates/interfaces/vxlan opt/vyatta/share/vyatta-cfg/templates/interfaces/wireguard diff --git a/gen-interface-policy-templates.pl b/gen-interface-policy-templates.pl index b48b24e..b4ab55f 100755 --- a/gen-interface-policy-templates.pl +++ b/gen-interface-policy-templates.pl @@ -60,7 +60,7 @@ my %interface_hash = ( 'vxlan/node.tag' => '$VAR(../../@)', 'wireless/node.tag' => '$VAR(../../@)', 'wireless/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', - 'wirelessmodem/node.tag' => '$VAR(../../@)', + 'wwan/node.tag' => '$VAR(../../@)', 'wireguard/node.tag' => '$VAR(../../@)', ); diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index 9979de3..4b7df1f 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -60,7 +60,7 @@ my %interface_hash = ( 'vxlan/node.tag' => '$VAR(../../../@)', 'wireless/node.tag' => '$VAR(../../../@)', 'wireless/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', - 'wirelessmodem/node.tag' => '$VAR(../../../@)', + 'wwan/node.tag' => '$VAR(../../../@)', 'wireguard/node.tag' => '$VAR(../../../@)', ); @@ -90,7 +90,7 @@ my %firewall_hash = ( 'vxlan/node.tag' => 'vxlan $VAR(../@)', 'wireless/node.tag' => 'wireless $VAR(../@)', 'wireless/node.tag/vif/node.tag' => 'wireless $VAR(../../../@) vif $VAR(../@)', - 'wirelessmodem/node.tag' => 'wirelessmodem $VAR(../@)', + 'wwan/node.tag' => 'wwan $VAR(../@)', 'wireguard/node.tag' => 'wireguard $VAR(../@)', ); |