diff options
| author | runborg <runar@13xl.com> | 2019-07-05 22:23:59 +0200 |
|---|---|---|
| committer | Kim <kim.sidney@gmail.com> | 2019-07-05 22:23:59 +0200 |
| commit | eebb654d64fc8dafeecbda93414436a51881f776 (patch) | |
| tree | 3a6de0cc5b5c64bd68c1d9195df3a565bf867514 /templates | |
| parent | cb83db1758822dbd16fa712aa6aab7005d51b154 (diff) | |
| download | vyatta-cfg-system-eebb654d64fc8dafeecbda93414436a51881f776.tar.gz vyatta-cfg-system-eebb654d64fc8dafeecbda93414436a51881f776.zip | |
T1499: Allow for usage of systemd interface mappings (#103)
* T1499: Allow for usage of systemd interface mappings
* T1499: Fix not working regex in ethernet interface parsing
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/ethernet/node.def | 3 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/dhcp-interface/node.def | 2 | ||||
| -rw-r--r-- | templates/system/ipv6/strict-dad/node.def | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index b4e60340..2d66a11b 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -4,7 +4,8 @@ type: txt help: Ethernet interface name allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet val_help: <ethN>; Ethernet interface name -syntax:expression: pattern $VAR(@) "^(eth|lan)[0-9]+$" \ + <en[ospx]N; Ethernet interface name +syntax:expression: pattern $VAR(@) "^((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$" \ ; "interface ethernet $VAR(@): not a valid name" syntax:expression: exec \ diff --git a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def b/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def index f9d81b20..d2a4e3d6 100644 --- a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def +++ b/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the local IP address for this tunnel 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-tunnel.pl --interface=$VAR(@) --tunnel=$VAR(../@) --option=create diff --git a/templates/system/ipv6/strict-dad/node.def b/templates/system/ipv6/strict-dad/node.def index 7f4572e9..c52de988 100644 --- a/templates/system/ipv6/strict-dad/node.def +++ b/templates/system/ipv6/strict-dad/node.def @@ -21,7 +21,7 @@ create: delete: sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/all/accept_dad" sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/default/accept_dad" - for ifname in /sys/class/net/eth* ; do + for ifname in /sys/class/net/eth* /sys/class/net/en* ; do if [ -d $ifname ]; then ifname=${ifname#/sys/class/net/} sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/$ifname/accept_dad" |