diff options
| author | Kim <kim.sidney@gmail.com> | 2019-07-05 22:28:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 22:28:31 +0200 |
| commit | 44a86b84e332362984e15449bbe2d67c004ce545 (patch) | |
| tree | ffefec40bf55a2d3d05980f6038f99b7b2055aa5 | |
| parent | 3a508f28276fc0a0dbecd614f2a7b202276c91f9 (diff) | |
| parent | a2b8d418967e4a936c022657cb5e978933a939ff (diff) | |
| download | vyatta-nat-44a86b84e332362984e15449bbe2d67c004ce545.tar.gz vyatta-nat-44a86b84e332362984e15449bbe2d67c004ce545.zip | |
Merge pull request #7 from runborg/current
T1499: Allow for usage of systemd interface mappings
3 files changed, 3 insertions, 3 deletions
diff --git a/templates-cfg/nat/destination/rule/node.tag/inbound-interface/node.def b/templates-cfg/nat/destination/rule/node.tag/inbound-interface/node.def index 03466b9..e975469 100644 --- a/templates-cfg/nat/destination/rule/node.tag/inbound-interface/node.def +++ b/templates-cfg/nat/destination/rule/node.tag/inbound-interface/node.def @@ -20,7 +20,7 @@ commit:expression: exec " fi let i++ done - intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" + intf_group_name_array=\"en+ eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" i=0 for i in $intf_group_name_array; do if [ \"$i\" == \"$VAR(@)\" ]; then diff --git a/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def index f7bf286..11e16cd 100644 --- a/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def +++ b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def @@ -20,7 +20,7 @@ commit:expression: exec " fi let i++ done - intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+ vxlan+ vti+ l2tpeth+\" + intf_group_name_array=\"en+ eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+ vxlan+ vti+ l2tpeth+\" i=0 for i in $intf_group_name_array; do if [ \"$i\" == \"$VAR(@)\" ]; then diff --git a/templates-cfg/nat/source/rule/node.tag/outbound-interface/node.def b/templates-cfg/nat/source/rule/node.tag/outbound-interface/node.def index efbd9c3..752fc3d 100644 --- a/templates-cfg/nat/source/rule/node.tag/outbound-interface/node.def +++ b/templates-cfg/nat/source/rule/node.tag/outbound-interface/node.def @@ -20,7 +20,7 @@ commit:expression: exec " fi let i++ done - intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" + intf_group_name_array=\"en+ eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" i=0 for i in $intf_group_name_array; do if [ \"$i\" == \"$VAR(@)\" ]; then |