Merge pull request #26170 from kirelagin/wlan-fix
wirelessInterfaces: Add a missing parameter
This commit is contained in:
commit
0b7c4c1900
|
@ -1110,7 +1110,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
|
# 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}
|
#!${pkgs.stdenv.shell}
|
||||||
# Configure the new interface
|
# Configure the new interface
|
||||||
${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
|
${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
|
# It is important to have that rule first as overwriting the NAME attribute also prevents the
|
||||||
# next rules from matching.
|
# next rules from matching.
|
||||||
${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
|
${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
|
# Add the required, new WLAN interfaces to the default WLAN interface with the
|
||||||
# persistent, default name as assigned by udev.
|
# persistent, default name as assigned by udev.
|
||||||
|
|
Loading…
Reference in a new issue