diff options
Diffstat (limited to 'templates/interfaces')
| -rw-r--r-- | templates/interfaces/ethernet/node.def | 3 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/dhcp-interface/node.def | 2 |
2 files changed, 3 insertions, 2 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 |