From 2eb7e4bf61bda231220c46f96696fe5c98c5858f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20=C5=81abuz?= Date: Fri, 11 Apr 2025 18:33:49 +0200 Subject: [PATCH] comgt-ncm: fix modem manufacturer detection MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Link: https://github.com/openwrt/openwrt/pull/18460 Signed-off-by: Robert Marko --- package/network/utils/comgt/files/ncm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh index 761dafb24e3..a9869738387 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="" } -- 2.47.2