diff options
| author | Janik H. <janik@aq0.de> | 2024-03-16 18:11:20 +0100 |
|---|---|---|
| committer | Janik H. <janik@aq0.de> | 2024-03-16 18:11:58 +0100 |
| commit | 847a53742c6021774cff7377f828812a3142cddd (patch) | |
| tree | 9df132cfb84b21a6bda8e9d10a4fa7d2dd930cb0 /nixos/modules/services/networking | |
| parent | 99f728d5360c691b40c091b262857e68f139bf29 (diff) | |
| download | nixlib-847a53742c6021774cff7377f828812a3142cddd.tar nixlib-847a53742c6021774cff7377f828812a3142cddd.tar.gz nixlib-847a53742c6021774cff7377f828812a3142cddd.tar.bz2 nixlib-847a53742c6021774cff7377f828812a3142cddd.tar.lz nixlib-847a53742c6021774cff7377f828812a3142cddd.tar.xz nixlib-847a53742c6021774cff7377f828812a3142cddd.tar.zst nixlib-847a53742c6021774cff7377f828812a3142cddd.zip | |
nixos/networkmanager: ensure-profiles, make sure networkmanager is running
Diffstat (limited to 'nixos/modules/services/networking')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 63804a3b1c54..b7f0d9373608 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -584,6 +584,7 @@ in description = "Ensure that NetworkManager declarative profiles are created"; wantedBy = [ "multi-user.target" ]; before = [ "network-online.target" ]; + after = [ "NetworkManager.service" ]; script = let path = id: "/run/NetworkManager/system-connections/${id}.nmconnection"; in '' @@ -593,9 +594,7 @@ in ${pkgs.envsubst}/bin/envsubst -i ${ini.generate (lib.escapeShellArg profile.n) profile.v} > ${path (lib.escapeShellArg profile.n)} '') (lib.mapAttrsToList (n: v: { inherit n v; }) cfg.ensureProfiles.profiles) + '' - if systemctl is-active --quiet NetworkManager; then - ${pkgs.networkmanager}/bin/nmcli connection reload - fi + ${pkgs.networkmanager}/bin/nmcli connection reload ''; serviceConfig = { EnvironmentFile = cfg.ensureProfiles.environmentFiles; |