Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Adrian Bunk <bunk@stusta.de> |
| 3 | Date: Mon, 1 Oct 2018 16:53:31 +0300 |
| 4 | Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when |
| 5 | APN is not set |
| 6 | |
| 7 | In 1.20.2 the warning for this was turned into an error. |
| 8 | |
| 9 | (cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d) |
| 10 | --- |
| 11 | Upstream-Status: Backport |
| 12 | |
| 13 | utils/qmi-network.in | 12 +++++++----- |
| 14 | 1 file changed, 7 insertions(+), 5 deletions(-) |
| 15 | |
| 16 | diff --git a/utils/qmi-network.in b/utils/qmi-network.in |
| 17 | index bf7bed9..a9e5299 100755 |
| 18 | --- a/utils/qmi-network.in |
| 19 | +++ b/utils/qmi-network.in |
| 20 | @@ -334,11 +334,13 @@ start_network () |
| 21 | |
| 22 | setup_data_format |
| 23 | |
| 24 | - START_NETWORK_ARGS="apn='$APN'" |
| 25 | - if [ -n "$APN_USER" ]; then |
| 26 | - START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" |
| 27 | - if [ -n "$APN_PASS" ]; then |
| 28 | - START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" |
| 29 | + if [ -n "$APN" ]; then |
| 30 | + START_NETWORK_ARGS="apn='$APN'" |
| 31 | + if [ -n "$APN_USER" ]; then |
| 32 | + START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" |
| 33 | + if [ -n "$APN_PASS" ]; then |
| 34 | + START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" |
| 35 | + fi |
| 36 | fi |
| 37 | fi |
| 38 | |
| 39 | -- |
| 40 | 2.7.4 |
| 41 | |