From: Michael Pfeifroth <redacted>
Date: Thu, 17 Sep 2026 07:53:34 +0000 (+0200)
Subject: modemmanager: fix custom initial EPS bearer username
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f601e632e7d72da45ea7ff6a0dba01433f187d0a;p=openwrt-packages.git

modemmanager: fix custom initial EPS bearer username

The custom initial EPS bearer code uses init_username, which agrees
with the documented UCI option. However, the option was registered
and read as init_user, so init_username was discarded before the
custom EPS bearer settings were passed to mmcli.

Register and read the option consistently as init_username.

Signed-off-by: Michael Pfeifroth <redacted>
---

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 33d519f65..2537900eb 100644
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.24.0
-PKG_RELEASE:=13
+PKG_RELEASE:=14
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
diff --git a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
index d15c5bd83..9d9445516 100644
--- a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
+++ b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
@@ -287,7 +287,7 @@ proto_modemmanager_init_config() {
 	proto_config_add_string init_iptype
 	proto_config_add_string 'init_allowedauth:list(string)'
 	proto_config_add_string init_password
-	proto_config_add_string init_user
+	proto_config_add_string init_username
 	proto_config_add_string init_apn
 	proto_config_add_defaults
 }
@@ -588,10 +588,10 @@ proto_modemmanager_setup() {
 
 	local init_epsbearer
 	local init_iptype init_allowedauth
-	local init_password init_user init_apn
+	local init_password init_username init_apn
 	json_get_vars init_epsbearer
 	json_get_vars init_iptype init_allowedauth
-	json_get_vars init_password init_user init_apn
+	json_get_vars init_password init_username init_apn
 
 	local address prefix gateway mtu dns1 dns2