Skip to content

Commit

Permalink
Revert "nixos/wireless: fix failure with no interfaces"
Browse files Browse the repository at this point in the history
This reverts commit 8f17761.

Attempting to start any service from udev when systemd-udev-settle is
used at all hangs the boot for 2min. See issue #107341.
  • Loading branch information
rnhmjoj committed Dec 22, 2020
1 parent 4d0c6c6 commit 9f52d1f
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions nixos/modules/services/networking/wpa_supplicant.nix
Expand Up @@ -233,10 +233,9 @@ in {
path = [ pkgs.wpa_supplicant ];

script = ''
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]; then
echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]
then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
fi
iface_args="-s -u -D${cfg.driver} -c ${configFile}"
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
Expand All @@ -249,10 +248,6 @@ in {
fi
fi
done
if [ -z "$args" ]; then
echo >&2 "<3>No wireless interfaces detected (yet)."
exit 1
fi
'' else ''
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
''}
Expand All @@ -266,7 +261,7 @@ in {

# Restart wpa_supplicant when a wlan device appears or disappears.
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"
'';
};

Expand Down

0 comments on commit 9f52d1f

Please sign in to comment.