Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 247c25d302f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8305186bb44e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2020

  1. nixos/wpa_supplicant: fix #61391

    @lheckemann
    lheckemann committed Jan 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bbd6d21 View commit details

Commits on Jan 13, 2020

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

    nixos/wpa_supplicant: fix use with multiple interfaces
    @globin
    globin authored Jan 13, 2020
    Copy the full SHA
    8305186 View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 nixos/modules/services/networking/wpa_supplicant.nix
7 changes: 4 additions & 3 deletions nixos/modules/services/networking/wpa_supplicant.nix
View file
Original file line number Diff line number Diff line change
@@ -233,21 +233,22 @@ in {
path = [ pkgs.wpa_supplicant ];

script = ''
iface_args="-s -u -D${cfg.driver} -c ${configFile}"
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
UEVENT_PATH=/sys/class/net/$i/uevent
if [ -e "$UEVENT_PATH" ]; then
source "$UEVENT_PATH"
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
done
'' 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
'';
};