about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2014-02-13 18:04:46 +0100
committerRickard Nilsson <rickynils@gmail.com>2014-02-13 18:05:04 +0100
commitfc90a739ba24a3f0122b73472ed1c7f1264f7d6a (patch)
tree94bba8d3558bfac1de02f8c18c5edd64979bdc14 /nixos
parent0d506296f0f0e9c56fba9b3df42d9d5113da1d32 (diff)
downloadnixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar.gz
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar.bz2
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar.lz
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar.xz
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.tar.zst
nixlib-fc90a739ba24a3f0122b73472ed1c7f1264f7d6a.zip
networkmanager module: No need to start ModemManager explicitly, done by NM
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/networkmanager.nix7
1 files 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