domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uqmi: replace legacy command invoke with newer type

Browse Source 
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(cherry picked from commit 06d5d01e8a)
This commit is contained in:
Koen Vandeputte
2017-10-24 16:20:22 +02:00
committed by Jo-Philipp Wich
parent 5872c19c63
commit bead60c2d3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh
View File

@@ -109,7 +109,7 @@ proto_qmi_setup() {
echo "Starting network $interface" echo "Starting network $interface"
pdptype=`echo "$pdptype" | awk '{print tolower($0)}'` pdptype=$(echo "$pdptype" | awk '{print tolower($0)}')
[ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip" [ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip"
if [ "$pdptype" = "ip" ]; then if [ "$pdptype" = "ip" ]; then
@@ -120,7 +120,7 @@ proto_qmi_setup() {
fi fi
[ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && { [ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && {
cid_4=`uqmi -s -d "$device" --get-client-id wds` cid_4=$(uqmi -s -d "$device" --get-client-id wds)
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo "Unable to obtain client ID" echo "Unable to obtain client ID"
proto_notify_error "$interface" NO_CID proto_notify_error "$interface" NO_CID
@@ -134,14 +134,14 @@ proto_qmi_setup() {
--stop-network 0xffffffff \ --stop-network 0xffffffff \
--autoconnect > /dev/null --autoconnect > /dev/null
pdh_4=`uqmi -s -d "$device" --set-client-id wds,"$cid_4" \ pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \
--start-network \ --start-network \
${apn:+--apn $apn} \ ${apn:+--apn $apn} \
${profile:+--profile $profile} \ ${profile:+--profile $profile} \
${auth:+--auth-type $auth} \ ${auth:+--auth-type $auth} \
${username:+--username $username} \ ${username:+--username $username} \
${password:+--password $password} \ ${password:+--password $password} \
${autoconnect:+--autoconnect}` ${autoconnect:+--autoconnect})
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo "Unable to connect IPv4" echo "Unable to connect IPv4"
uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds
@@ -151,7 +151,7 @@ proto_qmi_setup() {
} }
[ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && { [ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && {
cid_6=`uqmi -s -d "$device" --get-client-id wds` cid_6=$(uqmi -s -d "$device" --get-client-id wds)
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo "Unable to obtain client ID" echo "Unable to obtain client ID"
proto_notify_error "$interface" NO_CID proto_notify_error "$interface" NO_CID
@@ -165,14 +165,14 @@ proto_qmi_setup() {
--stop-network 0xffffffff \ --stop-network 0xffffffff \
--autoconnect > /dev/null --autoconnect > /dev/null
pdh_6=`uqmi -s -d "$device" --set-client-id wds,"$cid_6" \ pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \
--start-network \ --start-network \
${apn:+--apn $apn} \ ${apn:+--apn $apn} \
${profile:+--profile $profile} \ ${profile:+--profile $profile} \
${auth:+--auth-type $auth} \ ${auth:+--auth-type $auth} \
${username:+--username $username} \ ${username:+--username $username} \
${password:+--password $password} \ ${password:+--password $password} \
${autoconnect:+--autoconnect}` ${autoconnect:+--autoconnect})
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo "Unable to connect IPv6" echo "Unable to connect IPv6"
uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds