git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "nixos/wireless: make wireless.interfaces mandatory"

This reverts commit 030a521adc9510207dd9f06b8d8b552ff7d999f9.

commiteba5f5c1e5a61ef65a970c699b9f93aff87448bf authorrnhmjoj <rnhmjoj@inventati.org> dateMon 7 Jun 2021, 15:55 (5 years ago) parentc43e0f4
2 files changed+17−19
nixos/doc/manual/release-notes/rl-2105.xml−9 nixos/modules/services/networking/wpa_supplicant.nix+17−10
nixos/doc/manual/release-notes/rl-2105.xml−9
@@ -181,15 +181,6 @@
181181 <para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
182182 </listitem>
183183
184− <listitem>
185− <para>
186− Enabling wireless networking now requires specifying at least one network
187− interface using <xref linkend="opt-networking.wireless.interfaces"/>.
188− This is to avoid a race condition with the card initialisation (see
189− <link xlink:href="https://github.com/NixOS/nixpkgs/issues/101963">issue
190− #101963</link> for more information).
191− </para>
192− </listitem>
193184 <listitem>
194185 <para>
195186 If you are using <option>services.udev.extraRules</option> to assign
nixos/modules/services/networking/wpa_supplicant.nix+17−10
@@ -40,7 +40,8 @@ in {
4040 default = [];
4141 example = [ "wlan0" "wlan1" ];
4242 description = ''
43− The interfaces <command>wpa_supplicant</command> will use.
43+ The interfaces <command>wpa_supplicant</command> will use. If empty, it will
44+ automatically use all wireless interfaces.
4445 '';
4546 };
4647
@@ -219,14 +220,7 @@ in {
219220 };
220221
221222 config = mkIf cfg.enable {
222− assertions = [
223− { assertion = cfg.interfaces != [];
224− message = ''
225− No network interfaces for wpa_supplicant have been configured.
226− Please, specify at least one using networking.wireless.interfaces.
227− '';
228− }
229− ] ++ flip mapAttrsToList cfg.networks (name: cfg: {
223+ assertions = flip mapAttrsToList cfg.networks (name: cfg: {
230224 assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1;
231225 message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
232226 });
@@ -261,7 +255,20 @@ in {
261255 then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."
262256 fi
263257 iface_args="-s -u -D${cfg.driver} ${configStr}"
264− args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
258+ ${if ifaces == [] then ''
259+ for i in $(cd /sys/class/net && echo *); do
260+ DEVTYPE=
261+ UEVENT_PATH=/sys/class/net/$i/uevent
262+ if [ -e "$UEVENT_PATH" ]; then
263+ source "$UEVENT_PATH"
264+ if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
265+ args+="''${args:+ -N} -i$i $iface_args"
266+ fi
267+ fi
268+ done
269+ '' else ''
270+ args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
271+ ''}
265272 exec wpa_supplicant $args
266273 '';
267274 };