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 33d519f65bc595fe64ed44d117f98858f6dd0342..2537900eb6e31d658171c92aeddaeab8cd31a8bd 100644 (file)
--- 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 d15c5bd83f5d24b2e039ad994f2c64d3c4aa0632..9d9445516a87dcf590c1f01c6442ca02389394d3 100644 (file)
--- 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