about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-05-24 19:44:15 +0200
committerGitHub <noreply@github.com>2020-05-24 19:44:15 +0200
commit73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0 (patch)
tree185b9c0207c80fff2b6fee130879b3b2aa75ec9e /nixos
parent2226972c7a76e947c8882558fe51288fb83709b7 (diff)
parent563a3f5a81286fa908c0f296c32e6e210d485406 (diff)
downloadnixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar.gz
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar.bz2
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar.lz
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar.xz
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.tar.zst
nixlib-73b4ea16f7e3172fdc1638ec3328d3536f4d8ac0.zip
Merge pull request #88725 from aanderse/modem-manager
nixos/networkmanager: apply --filter-policy=STRICT to modemmanager service
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 6f24141b33cf..cc789897b29f 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -449,6 +449,13 @@ in {
 
     systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ];
 
+    # override unit as recommended by upstream - see https://github.com/NixOS/nixpkgs/issues/88089
+    # TODO: keep an eye on modem-manager releases as this will eventually be added to the upstream unit
+    systemd.services.ModemManager.serviceConfig.ExecStart = [
+      ""
+      "${pkgs.modemmanager}/sbin/ModemManager --filter-policy=STRICT"
+    ];
+
     systemd.services.NetworkManager-dispatcher = {
       wantedBy = [ "network.target" ];
       restartTriggers = [ configFile ];