summaryrefslogtreecommitdiff
path: root/templates/interfaces/ethernet
diff options
context:
space:
mode:
authorrunborg <runar@13xl.com>2019-07-05 22:23:59 +0200
committerKim <kim.sidney@gmail.com>2019-07-05 22:23:59 +0200
commiteebb654d64fc8dafeecbda93414436a51881f776 (patch)
tree3a6de0cc5b5c64bd68c1d9195df3a565bf867514 /templates/interfaces/ethernet
parentcb83db1758822dbd16fa712aa6aab7005d51b154 (diff)
downloadvyatta-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/interfaces/ethernet')
-rw-r--r--templates/interfaces/ethernet/node.def3
1 files changed, 2 insertions, 1 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 \