From fc90a739ba24a3f0122b73472ed1c7f1264f7d6a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 13 Feb 2014 18:04:46 +0100 Subject: [PATCH] networkmanager module: No need to start ModemManager explicitly, done by NM --- nixos/modules/services/networking/networkmanager.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e5213c7fccf3..fd5ff5e44983 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -177,16 +177,13 @@ in { systemd.services."networkmanager-init" = { description = "NetworkManager initialisation"; wantedBy = [ "network.target" ]; - partOf = [ "NetworkManager.service" ]; - wants = [ "ModemManager.service" "NetworkManager.service" ]; + wants = [ "NetworkManager.service" ]; before = [ "NetworkManager.service" ]; script = '' mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 755 -p ${stateDirs} ''; - serviceConfig = { - Type = "oneshot"; - }; + serviceConfig.Type = "oneshot"; }; # Turn off NixOS' network management