modemmanager: fix bearer disconnection logic

The bearer status wasn't being loaded in key/value mode, and therefore
would always fail to load the IPv4 config method.

Signed-off-by: Aleksander Morgado <redacted>

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 61f42bafdf10c59dbb279283a6edbb593a0110b8..94849b3cccc68fd8565939cdf169bdddcf48df66 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.10.8
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager

diff --git a/net/modemmanager/files/modemmanager.proto b/net/modemmanager/files/modemmanager.proto
index 963f70c7936bd8e1743aa19f9b067c380d07edf0..cc35ebefd35961a3cc4e377e17f7940b727a0620 100755 (executable)
--- a/net/modemmanager/files/modemmanager.proto
+++ b/net/modemmanager/files/modemmanager.proto
@@ -375,7 +375,7 @@ proto_modemmanager_teardown() {
        }
 
        # load bearer connection method
-       bearerstatus=$(mmcli --bearer "${bearerpath}")
+       bearerstatus=$(mmcli --bearer "${bearerpath}" --output-keyvalue)
        bearermethod=$(modemmanager_get_field "${bearerstatus}" "bearer.ipv4-config.method")
        [ -n "${bearermethod}" ] || {
                echo "couldn't load bearer method"