summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-02-08 20:16:34 +0100
committerDomen Kožar <domen@dev.si>2014-02-08 20:17:00 +0100
commitb17edbac57919117475525cdc7fb9301224c0263 (patch)
treede587c654ae39acdb791a4d45a27213c017efa69 /nixos/modules
parent61f20ca45ea848185123c65f483d4929c417dadc (diff)
downloadnixlib-b17edbac57919117475525cdc7fb9301224c0263.tar
nixlib-b17edbac57919117475525cdc7fb9301224c0263.tar.gz
nixlib-b17edbac57919117475525cdc7fb9301224c0263.tar.bz2
nixlib-b17edbac57919117475525cdc7fb9301224c0263.tar.lz
nixlib-b17edbac57919117475525cdc7fb9301224c0263.tar.xz
nixlib-b17edbac57919117475525cdc7fb9301224c0263.tar.zst
nixlib-b17edbac57919117475525cdc7fb9301224c0263.zip
ModemManager: 0.5.4.0 -> 0.7.991
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 0b079e3567a1..2db96d9cd31e 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -31,7 +31,7 @@ let
 
     [modem-manager]
     Identity=unix-group:networkmanager
-    Action=org.freedesktop.ModemManager.*
+    Action=org.freedesktop.ModemManager*
     ResultAny=yes
     ResultInactive=no
     ResultActive=yes
@@ -42,7 +42,7 @@ let
         subject.isInGroup("networkmanager")
         && subject.active
         && (action.id.indexOf("org.freedesktop.NetworkManager.") == 0
-            || action.id.indexOf("org.freedesktop.ModemManager.")  == 0
+            || action.id.indexOf("org.freedesktop.ModemManager")  == 0
         ))
           { return polkit.Result.YES; }
     });
@@ -161,6 +161,7 @@ in {
         networkmanager_vpnc
         networkmanager_openconnect
         networkmanager_pptp
+        modemmanager
         ];
 
     users.extraGroups = singleton {
@@ -177,7 +178,7 @@ in {
       description = "NetworkManager initialisation";
       wantedBy = [ "network.target" ];
       partOf = [ "NetworkManager.service" ];
-      wants = [ "NetworkManager.service" ];
+      wants = [ "ModemManager.service" ];
       before = [ "NetworkManager.service" ];
       script = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections
@@ -206,6 +207,7 @@ in {
         networkmanager_vpnc
         networkmanager_openconnect
         networkmanager_pptp
+        modemmanager
         ];
 
     services.udev.packages = cfg.packages;