diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-21 17:40:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-21 17:40:59 +0000 |
| commit | c038f97df01a198d1d0e4c9de04e22d42f4d41bf (patch) | |
| tree | 1118b56d6c57e4eb629a2b2ca07dc66accd3db34 | |
| parent | bf7560d328bf916ebb7b231796ce4181bc13a0ae (diff) | |
| download | master-187ad058-c038f97df01a198d1d0e4c9de04e22d42f4d41bf.tar.gz master-187ad058-c038f97df01a198d1d0e4c9de04e22d42f4d41bf.tar.bz2 master-187ad058-c038f97df01a198d1d0e4c9de04e22d42f4d41bf.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47014 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/utils/uqmi/Makefile | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile index 16e7fea0a9..7ccf549989 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 index 8ee7dbdecf..48864bea4b 100644..100755 --- 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)" |