summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-17 21:13:19 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-17 21:13:19 +0100
commitd3b689ecb951c49dddf0402f36f51a2e0d8216b3 (patch)
tree1048aec8ff2347696643d92a4bf48170936b4201 /data
parent80375d2be96c53f2fa4a827f93105dc32931401f (diff)
parent4e4f1dbd745952a24d70c3e2d7dc495d675dff34 (diff)
downloadvyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.tar.gz
vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: dns: T1786: add proper processing of 'system disable-dhcp-nameservers' openvpn: fix typo in op-mode command on display rx bytes T1801: escape isolated backslashes before passing to ConfigTree() wireless: T1627: fix interface names for list_interfaces.py [service https] T1443: add setting of HTTPS listen port
Diffstat (limited to 'data')
-rw-r--r--data/interface-types.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/interface-types.json b/data/interface-types.json
index f5820f403..f1862b882 100644
--- a/data/interface-types.json
+++ b/data/interface-types.json
@@ -11,7 +11,7 @@
"l2tpv3": "l2tpeth",
"vxlan": "vxlan",
"wireguard": "wg",
- "wireless": "wireless",
+ "wireless": "wlan",
"wirelessmodem": "wlm",
"input": "ifb",
"pppoe": "pppoe"