summary refs log tree commit diff
path: root/nixos/modules/services/networking/supplicant.nix
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2022-05-05 13:23:32 +0200
committerJanne Heß <janne@hess.ooo>2022-05-05 20:00:31 +0200
commit57cd07f3a9d27d1a63918fe21add060ecde4a29f (patch)
tree410bd179ab7dd88e84657cd2fe194013a3211367 /nixos/modules/services/networking/supplicant.nix
parentc01480f0a32d8584e60f128b9c7fc6cb98d64ede (diff)
downloadnixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar.gz
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar.bz2
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar.lz
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar.xz
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.tar.zst
nixpkgs-57cd07f3a9d27d1a63918fe21add060ecde4a29f.zip
treewide: pkgs.systemd -> config.systemd.package
This ensures there is only one systemd package when e.g. testing the
next systemd version.
Diffstat (limited to 'nixos/modules/services/networking/supplicant.nix')
-rw-r--r--nixos/modules/services/networking/supplicant.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 8df450a11c6..e111b311d68 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -226,10 +226,10 @@ in
               ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="${i}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="supplicant-${replaceChars [" "] ["-"] iface}.service", TAG+="SUPPLICANT_ASSIGNED"''))}
 
           ${optionalString (hasAttr "WLAN" cfg) ''
-            ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service"
+            ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-wlan@$result.service"
           ''}
           ${optionalString (hasAttr "LAN" cfg) ''
-            ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="${pkgs.systemd}/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service"
+            ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="lan", TAG!="SUPPLICANT_ASSIGNED", TAG+="systemd", PROGRAM="/run/current-system/systemd/bin/systemd-escape -p %E{INTERFACE}", ENV{SYSTEMD_WANTS}+="supplicant-lan@$result.service"
           ''}
         '';
       })];