From: Dmitry Tunin Date: Sat, 28 Jul 2018 23:53:01 +0000 (+0300) Subject: luci-proto-ncm: suggest both tty and wdm devices X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F1989%2Fhead;p=oweals%2Fluci.git luci-proto-ncm: suggest both tty and wdm devices Some modems are controlled only through a tty. Autodetection of control device is broken in ncm.sh Signed-off-by: Dmitry Tunin --- diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua index b258dfc59..318db7e77 100644 --- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua +++ b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua @@ -19,16 +19,13 @@ local ipv6, delay, defaultroute, metric, peerdns, dns device = section:taboption("general", Value, "device", translate("Modem device")) device.rmempty = false -local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*") - or nixio.fs.glob("/dev/ttyUSB*") - -if device_suggestions then - local node - for node in device_suggestions do - device:value(node) - end +local dev +for dev in nixio.fs.glob("/dev/ttyUSB*") do + device:value(dev) +end +for dev in nixio.fs.glob("/dev/cdc-wdm*") do + device:value(dev) end - mode = section:taboption("general", Value, "mode", translate("Service Type")) mode:value("", translate("Modem default"))