modemmanager: move iface cleanup to wrapper script

If the ModemManager process crashes, the interfaces are not cleaned
up properly because the stop_service method is not called. With this
change, the interfaces are cleaned up both when stopping the service
and during a crash. Therefore it is no longer necessary to perform a
cleanup at the beginning.

Signed-off-by: Oliver Sedlbauer <osedlbauer@tdt.de>

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index bef514550df4cff0e4974916c9f07b0f2f72cd26..e484b7fbd00add0e10fd068146bc47298fff5cb6 100644 (file)
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_SOURCE_VERSION:=1.22.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git

diff --git a/net/modemmanager/files/modemmanager.init b/net/modemmanager/files/modemmanager.init
index 7f014dc56ecb64746e71083b86b5ec2873579d88..a036d884da4f2c11d6253aec396b4d4d8d7f2ec6 100755 (executable)
--- a/net/modemmanager/files/modemmanager.init
+++ b/net/modemmanager/files/modemmanager.init
@@ -6,13 +6,6 @@ START=70
 
 LOG_LEVEL="INFO"
 
-stop_service() {
-       # Load common utils
-       . /usr/share/ModemManager/modemmanager.common
-       # Set all configured interfaces as unavailable
-       mm_cleanup_interfaces
-}
-
 start_service() {
        # Setup ModemManager service
        #

diff --git a/net/modemmanager/files/usr/sbin/ModemManager-wrapper b/net/modemmanager/files/usr/sbin/ModemManager-wrapper
index 4fd64227fe33840c4d4559eba6710b8e79915ca8..97c2a826de89845cf325f817ee7c0270dbd38869 100644 (file)
--- a/net/modemmanager/files/usr/sbin/ModemManager-wrapper
+++ b/net/modemmanager/files/usr/sbin/ModemManager-wrapper
@@ -20,7 +20,6 @@ main() {
 
        mkdir -p "${MODEMMANAGER_RUNDIR}"
        chmod 0755 "${MODEMMANAGER_RUNDIR}"
-       mm_cleanup_interfaces
 
        /usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
        CHILD="$!"
@@ -28,6 +27,9 @@ main() {
        mm_report_events_from_cache
 
        wait "$CHILD"
+
+       # Set all configured interfaces as unavailable
+       mm_cleanup_interfaces
 }
 
 main "$@"