diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-05-29 22:49:02 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-18 21:45:35 +0200 |
| commit | 6727ddc78035c14ca5015419ef4a9240af8288d8 (patch) | |
| tree | c6f94fb40dd22e32efa33fcf1713718bcee46ca3 | |
| parent | 538333e24e65583df8c76d9f211ef58edb6176a1 (diff) | |
| download | vyos-1x-6727ddc78035c14ca5015419ef4a9240af8288d8.tar.gz vyos-1x-6727ddc78035c14ca5015419ef4a9240af8288d8.zip | |
console-server: T2490: use new USB ports "by-bus"
| -rw-r--r-- | interface-definitions/ser2net.xml.in | 4 | ||||
| -rwxr-xr-x | src/conf_mode/ser2net.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/interface-definitions/ser2net.xml.in b/interface-definitions/ser2net.xml.in index b9520d20b..8b025070f 100644 --- a/interface-definitions/ser2net.xml.in +++ b/interface-definitions/ser2net.xml.in @@ -19,11 +19,11 @@ <description>Regular serial interface</description> </valueHelp> <valueHelp> - <format>ttyUSBxxx</format> + <format>usbxbxpx</format> <description>USB based serial interface</description> </valueHelp> <constraint> - <regex>^tty(S|USB)[0-9]+$</regex> + <regex>^(ttyS\d+|usb\d+b.*p.*)$</regex> </constraint> </properties> <children> diff --git a/src/conf_mode/ser2net.py b/src/conf_mode/ser2net.py index 5231a6a05..ec8afcb48 100755 --- a/src/conf_mode/ser2net.py +++ b/src/conf_mode/ser2net.py @@ -46,7 +46,7 @@ def get_config(): 'data_bits': '', 'parity': '', 'port': '', - 'serial_port': '/dev/' + serial_port, + 'serial_port': '/dev/serial/by-bus/' + serial_port, 'speed': '', 'stop_bits': '', 'timeout': '600' |