From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 21 Sep 2015 17:40:59 +0000 (+0000)
Subject: uqmi: Add qmi.sh executable bit and fix option dhcp
X-Git-Tag: reboot~1938
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d4760cd9b4c0d4f761eedd9d6aebb369f27b347a;p=openwrt%2Fstaging%2Fblogic.git

uqmi: Add qmi.sh executable bit and fix option dhcp

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@elisanet.fi>

SVN-Revision: 47014
---

diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile
index 16e7fea0a94c..7ccf549989e3 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 8ee7dbdecf17..48864bea4b0d
--- 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)"