nixos/networkmanager: match upstream units Install sections (NixOS#36…

…8791)
khaneliman · Dec 28, 2024 · 253d319 · 253d319
2 parents a35b4a5 + a00e827
commit 253d319
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
@@ -598,7 +598,7 @@ in
     ];
 
     systemd.services.NetworkManager = {
-      wantedBy = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
       restartTriggers = [ configFile ];
 
       aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
@@ -614,7 +614,7 @@ in
     };
 
     systemd.services.NetworkManager-dispatcher = {
-      wantedBy = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
       restartTriggers = [
         configFile
         overrideNameserversScript

diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix
@@ -33,6 +33,17 @@ let
     };
   } extraConfig;
   testCases = {
+    startup = {
+      name = "startup";
+      nodes.client = {
+        networking.useDHCP = false;
+        networking.networkmanager.enable = true;
+      };
+      testScript = ''
+        with subtest("NetworkManager is started automatically at boot"):
+          client.wait_for_unit("NetworkManager.service")
+      '';
+    };
     static = {
       name = "static";
       nodes = {