Author: nbd Date: 2014-10-02 14:18:28 +0200 (Thu, 02 Oct 2014) New Revision: 42719
Modified: trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh Log: uqmi: work out the ifname instead of relying on it being in uci Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh =================================================================== --- trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh 2014-10-02 12:05:58 UTC (rev 42718) +++ trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh 2014-10-02 12:18:28 UTC (rev 42719) @@ -5,6 +5,8 @@ init_proto "$@" proto_qmi_init_config() { + available=1 + no_device=1 proto_config_add_string "device:device" proto_config_add_string apn proto_config_add_string auth @@ -34,6 +36,16 @@ return 1 } + devname="$(basename "$device")" + devpath="$(readlink -f /sys/class/usbmisc/$devname/device/)" + ifname="$( ls "$devpath"/net )" + [ -n "$ifname" ] || { + logger -p daemon.err -t "qmi[$$]" "The interface could not be found." + proto_notify_error "$interface" NO_IFACE + proto_block_restart "$interface" + return 1 + } + [ -n "$delay" ] && sleep "$delay" while uqmi -s -d "$device" --get-pin-status | grep '"UIM uninitialized"' > /dev/null; do @@ -93,7 +105,7 @@ fi logger -p daemon.info -t "qmi[$$]" "Connected, starting DHCP" - proto_init_update "*" 1 + proto_init_update "$ifname" 1 proto_send_update "$interface" json_init _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
