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

Revert "nixos/wireless: fix failure with no interfaces"

Browse Source 
This reverts commit 8f177612b1.

Attempting to start any service from udev when systemd-udev-settle is
used at all hangs the boot for 2min. See issue #107341.
This commit is contained in:
rnhmjoj 2020-12-22 10:17:32 +01:00
parent 4d0c6c645c
commit 9f52d1f234
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,10 +233,9 @@ in {
path = [ pkgs.wpa_supplicant ]; path = [ pkgs.wpa_supplicant ];
script = '' script = ''
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]
echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi fi
iface_args="-s -u -D${cfg.driver} -c ${configFile}" 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
@ -249,10 +248,6 @@ in {
fi fi
fi fi
done done
if [ -z "$args" ]; then
echo >&2 "<3>No wireless interfaces detected (yet)."
exit 1
fi
'' else '' '' else ''
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''} ''}
@ -266,7 +261,7 @@ in {
# Restart wpa_supplicant when a wlan device appears or disappears. # Restart wpa_supplicant when a wlan device appears or disappears.
services.udev.extraRules = '' services.udev.extraRules = ''
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl restart wpa_supplicant.service" ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="/run/current-system/systemd/bin/systemctl try-restart wpa_supplicant.service"
''; '';
}; };