JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #77554 from lheckemann/fix-wpa-multiple1

Browse Source 
nixos/wpa_supplicant: fix use with multiple interfaces
This commit is contained in:
Robin Gloster 2020-01-13 12:07:54 +01:00 committed by GitHub
commit 8305186bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/wpa_supplicant.nix
View File

@ -233,6 +233,7 @@ in {
path = [ pkgs.wpa_supplicant ]; path = [ pkgs.wpa_supplicant ];
script = '' script = ''
iface_args="-s -u -D${cfg.driver} -c ${configFile}"
${if ifaces == [] then '' ${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do for i in $(cd /sys/class/net && echo *); do
DEVTYPE= DEVTYPE=
@ -240,14 +241,14 @@ in {
if [ -e "$UEVENT_PATH" ]; then if [ -e "$UEVENT_PATH" ]; then
source "$UEVENT_PATH" source "$UEVENT_PATH"
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
ifaces="$ifaces''${ifaces:+ -N} -i$i" args+="''${args:+ -N} -i$i $iface_args"
fi fi
fi fi
done done
'' else '' '' else ''
ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}" args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''} ''}
exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces exec wpa_supplicant $args
''; '';
}; };