summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-06-17 15:31:22 +0100
committerGitHub <noreply@github.com>2017-06-17 15:31:22 +0100
commit0b7c4c19002d917a225675089fb58bb46dcdff8d (patch)
treefaf3f2ad117cfdf709a5d560d7d7c6d45d80f43b /nixos/modules/tasks
parenta071a06c61ff112f102d98f8ff4e29c1084f04fc (diff)
parentb1f56b8b0c87ea01e1cf5f423124b83170d26272 (diff)
downloadnixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar.gz
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar.bz2
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar.lz
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar.xz
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.tar.zst
nixlib-0b7c4c19002d917a225675089fb58bb46dcdff8d.zip
Merge pull request #26170 from kirelagin/wlan-fix
wirelessInterfaces: Add a missing parameter
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/network-interfaces.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e9a3dca6418a..8ce7b2d2cf36 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1110,7 +1110,7 @@ in
             '';
 
             # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
-            newInterfaceScript = new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
+            newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
               #!${pkgs.stdenv.shell}
               # Configure the new interface
               ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
@@ -1132,7 +1132,7 @@ in
             # It is important to have that rule first as overwriting the NAME attribute also prevents the
             # next rules from matching.
             ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
-            ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"'')}
+            ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')}
 
             # Add the required, new WLAN interfaces to the default WLAN interface with the
             # persistent, default name as assigned by udev.