[OpenWrt-Devel] [PATCH] uqmi: Add qmi.sh executable bit and fix option dhcp

[Matti Laakso]

Using protocol qmi does not work since qmi.sh is not executable.
Setting option dhcp explicitely to 0 actually enables it.
This patch fixes both problems.

Signed-off-by: Matti Laakso <malaakso at elisanet.fi>
---
 package/network/utils/uqmi/Makefile                      | 2 +-
 package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh

diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile
index 16e7fea..7ccf549 100644
--- a/package/network/utils/uqmi/Makefile
+++ b/package/network/utils/uqmi/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uqmi
-PKG_VERSION:=2015-08-13
+PKG_VERSION:=2015-09-17
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
old mode 100644
new mode 100755
index 8ee7dbd..48864be
--- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
+++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
@@ -140,7 +140,7 @@ proto_qmi_setup() {
 		return 1
 	}
 
-	if [ -z "$dhcp" ]; then
+	if [ -z "$dhcp" -o "$dhcp" = 0 ]; then
 		echo "Setting up $ifname"
 		[ -n "$ipv4" ] && {
 			json_load "$(uqmi -s -d $device --set-client-id wds,$cid_4 --get-current-settings)"
-- 
2.1.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel