From 55c3f7d3f693029ee759bd8f77573eef3ae5204b Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Wed, 25 Sep 2019 13:23:42 +0200
Subject: systemd: always start MM after polkit service if enabling policy

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/113
---
 data/Makefile.am             | 3 ++-
 data/ModemManager.service.in | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index ee05bdf6..447cb3d0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,8 @@ edit = @sed \
        -e 's|@sbindir[@]|$(sbindir)|g' \
        -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
        -e 's|@localstatedir[@]|$(localstatedir)|g' \
-       -e 's|@libexecdir[@]|$(libexecdir)|g'
+       -e 's|@libexecdir[@]|$(libexecdir)|g' \
+       -e 's|@MM_POLKIT_SERVICE[@]|$(MM_POLKIT_SERVICE)|g'
 
 
 # DBus Service file
diff --git a/data/ModemManager.service.in b/data/ModemManager.service.in
index 420d22b1..23bf8091 100644
--- a/data/ModemManager.service.in
+++ b/data/ModemManager.service.in
@@ -1,5 +1,7 @@
 [Unit]
 Description=Modem Manager
+After=@MM_POLKIT_SERVICE@
+Requires=@MM_POLKIT_SERVICE@
 
 [Service]
 Type=dbus
-- 
cgit v1.2.3-70-g09d2