diff options
| author | Jakub Łabuz | 2025-04-11 16:33:49 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-04-17 23:37:48 +0000 |
| commit | 2eb7e4bf61bda231220c46f96696fe5c98c5858f (patch) | |
| tree | 03d6307d07dad49455220889b84717e151411f0e | |
| parent | 5d26507a73b166e6a47522478455bb95bc73672b (diff) | |
| download | openwrt-2eb7e4bf61bda231220c46f96696fe5c98c5858f.tar.gz | |
comgt-ncm: fix modem manufacturer detection
Fix an issue where NCM interface initialization fails because of wrong
modem manufacturer detection.
gcom call returns an output with Windows-style line breaks (containing \r)
what makes awk call return empty or malformed manufacturer name. Changing
awk RS variable to handle both \n and \r\n as line break fixes this issue.
Fixes #17448 and #17998 GitHub issues.
Signed-off-by: Jakub Łabuz <jakub@labuz.dev>
Link: https://github.com/openwrt/openwrt/pull/18460
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/network/utils/comgt/files/ncm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh index 761dafb24e..a986973838 100644 --- a/package/network/utils/comgt/files/ncm.sh +++ b/package/network/utils/comgt/files/ncm.sh @@ -91,7 +91,7 @@ proto_ncm_setup() { start=$(date +%s) while true; do - manufacturer=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk 'NF && $0 !~ /AT\+CGMI/ { sub(/\+CGMI: /,""); print tolower($1); exit; }') + manufacturer=$(gcom -d "$device" -s /etc/gcom/getcardinfo.gcom | awk -v RS='\r?\n' 'NF && $0 !~ /AT\+CGMI/ { sub(/\+CGMI: /,""); print tolower($1); exit; }') [ "$manufacturer" = "error" ] && { manufacturer="" } |