diff options
| author | Kim <kim.sidney@gmail.com> | 2019-07-05 22:29:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 22:29:03 +0200 |
| commit | 4d7e36351b5ee572278c66b391747abf57e6732e (patch) | |
| tree | 3791332756e66b768da305a5211fbc66777dc46b | |
| parent | 3cb86c636fcc4e6e5594b67e01bbb9147d7cbd05 (diff) | |
| parent | 4f6182f77ce5925b22c16bbde6a359e13ccc9c6a (diff) | |
| download | vyatta-cfg-quagga-4d7e36351b5ee572278c66b391747abf57e6732e.tar.gz vyatta-cfg-quagga-4d7e36351b5ee572278c66b391747abf57e6732e.zip | |
Merge pull request #29 from runborg/current
T1499: Allow for usage of systemd interface mappings
| -rw-r--r-- | templates/protocols/static/route/node.tag/dhcp-interface/node.def | 2 | ||||
| -rw-r--r-- | templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/protocols/static/route/node.tag/dhcp-interface/node.def b/templates/protocols/static/route/node.tag/dhcp-interface/node.def index db83853d..7820800b 100644 --- a/templates/protocols/static/route/node.tag/dhcp-interface/node.def +++ b/templates/protocols/static/route/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the next-hop IP address for this static route allowed: local -a array ; - array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; + array=( /var/lib/dhcp/en* /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; echo -n ${array[@]##*/} create: sudo /opt/vyatta/sbin/vyatta-update-static-route.pl --interface=$VAR(@) --route=$VAR(../@) --table=main --option=create diff --git a/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def b/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def index a86628ae..3f0afdb1 100644 --- a/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def +++ b/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the next-hop IP address for this static route allowed: local -a array ; - array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; + array=( /var/lib/dhcp/en* /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; echo -n ${array[@]##*/} create: ifc="$VAR(@)" |