Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/wpa_supplicant: add configFile option #94473

Closed
wants to merge 2 commits into from
Closed

nixos/wpa_supplicant: add configFile option #94473

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5f3ce
nixos/wpa_supplicant: add configFile option
lopsided98 Aug 1, 2020
c258bfb
nixos/wpa_supplicant: support spaces in config file name
lopsided98 Aug 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 38 additions & 28 deletions nixos/modules/services/networking/wpa_supplicant.nix
View file
Open in desktop
Expand Up @@ -4,28 +4,6 @@ with lib;

let
cfg = config.networking.wireless;
configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" ''
${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''}
${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
key = if psk != null
then ''"${psk}"''
else pskRaw;
baseAuth = if key != null
then ''psk=${key}''
else ''key_mgmt=NONE'';
in ''
network={
ssid="${ssid}"
${optionalString (priority != null) ''priority=${toString priority}''}
${optionalString hidden "scan_ssid=1"}
${if (auth != null) then auth else baseAuth}
${extraConfig}
}
'') cfg.networks)}
'' else "/etc/wpa_supplicant.conf";
in {
options = {
networking.wireless = {
Expand Down Expand Up @@ -202,6 +180,15 @@ in {
for available options.
'';
};

configFile = mkOption {
type = types.path;
default = "/etc/wpa_supplicant.conf";
description = ''
Path to the wpa_supplicant configuration file. Only used if the
configuration is not defined through other options in this module.
'';
};
};
};

Expand All @@ -211,6 +198,29 @@ in {
message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
});

networking.wireless.configFile = mkIf (cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable) (pkgs.writeText "wpa_supplicant.conf" ''
${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''}
${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
key = if psk != null
then ''"${psk}"''
else pskRaw;
baseAuth = if key != null
then ''psk=${key}''
else ''key_mgmt=NONE'';
in ''
network={
ssid="${ssid}"
${optionalString (priority != null) ''priority=${toString priority}''}
${optionalString hidden "scan_ssid=1"}
${if (auth != null) then auth else baseAuth}
${extraConfig}
}
'') cfg.networks)}
'');

environment.systemPackages = [ pkgs.wpa_supplicant ];

services.dbus.packages = [ pkgs.wpa_supplicant ];
Expand All @@ -233,22 +243,22 @@ in {
path = [ pkgs.wpa_supplicant ];

script = ''
iface_args="-s -u -D${cfg.driver} -c ${configFile}"
iface_args=(-s -u -D${escapeShellArg cfg.driver} -c ${escapeShellArg cfg.configFile})
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
UEVENT_PATH=/sys/class/net/$i/uevent
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
args+="''${args:+ -N} -i$i $iface_args"
if [ "$DEVTYPE" = wlan -o -e "/sys/class/net/$i/wireless" ]; then
args+=(''${args:+-N} -i"$i" "''${iface_args[@]}")
fi
fi
done
'' else ''
args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}"
args=(${concatMapStringsSep " -N " (i: ''-i${escapeShellArg i} "''${iface_args[@]}"'') ifaces})
''}
exec wpa_supplicant $args
exec wpa_supplicant "''${args[@]}"
'';
};

Expand Down