Merge pull request #12164 from NixOS/revert-12015-wpa_supplicant-service
Revert "Basic Declaritive Network Configuration in wpa_supplicant Service"
This commit is contained in:
commit
6102ba5d4f
|
@ -18,18 +18,8 @@ NixOS will start wpa_supplicant for you if you enable this setting:
|
||||||
networking.wireless.enable = true;
|
networking.wireless.enable = true;
|
||||||
</programlisting>
|
</programlisting>
|
||||||
|
|
||||||
NixOS lets you specify networks for wpa_supplicant declaratively:
|
NixOS currently does not generate wpa_supplicant's
|
||||||
<programlisting>
|
configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
|
||||||
networking.wireless.networks = {
|
|
||||||
echelon = {
|
|
||||||
psk = "abcdefgh";
|
|
||||||
};
|
|
||||||
"free.wifi" = {};
|
|
||||||
}
|
|
||||||
</programlisting>
|
|
||||||
|
|
||||||
When no networks are set it will default to using a configuration file at
|
|
||||||
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
|
|
||||||
yourself to define wireless networks, WPA keys and so on (see
|
yourself to define wireless networks, WPA keys and so on (see
|
||||||
wpa_supplicant.conf(5)).
|
wpa_supplicant.conf(5)).
|
||||||
</para>
|
</para>
|
||||||
|
|
|
@ -3,30 +3,51 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
cfg = config.networking.wireless;
|
cfg = config.networking.wireless;
|
||||||
configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
|
configFile = "/etc/wpa_supplicant.conf";
|
||||||
${optionalString cfg.userControlled.enable ''
|
|
||||||
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
|
ifaces =
|
||||||
update_config=1''}
|
cfg.interfaces ++
|
||||||
${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
|
optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
|
||||||
network={
|
|
||||||
ssid="${ssid}"
|
in
|
||||||
${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
|
|
||||||
${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
|
{
|
||||||
}
|
|
||||||
'') cfg.networks)}
|
###### interface
|
||||||
'' else "/etc/wpa_supplicant.conf";
|
|
||||||
in {
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
networking.WLANInterface = mkOption {
|
||||||
|
default = "";
|
||||||
|
description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
|
||||||
|
};
|
||||||
|
|
||||||
networking.wireless = {
|
networking.wireless = {
|
||||||
enable = mkEnableOption "wpa_supplicant";
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Whether to start <command>wpa_supplicant</command> to scan for
|
||||||
|
and associate with wireless networks. Note: NixOS currently
|
||||||
|
does not manage <command>wpa_supplicant</command>'s
|
||||||
|
configuration file, <filename>${configFile}</filename>. You
|
||||||
|
should edit this file yourself to define wireless networks,
|
||||||
|
WPA keys and so on (see
|
||||||
|
<citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry>), or use
|
||||||
|
networking.wireless.userControlled.* to allow users to add entries
|
||||||
|
through <command>wpa_cli</command> and <command>wpa_gui</command>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
interfaces = mkOption {
|
interfaces = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [];
|
default = [];
|
||||||
example = [ "wlan0" "wlan1" ];
|
example = [ "wlan0" "wlan1" ];
|
||||||
description = ''
|
description = ''
|
||||||
The interfaces <command>wpa_supplicant</command> will use. If empty, it will
|
The interfaces <command>wpa_supplicant</command> will use. If empty, it will
|
||||||
automatically use all wireless interfaces.
|
automatically use all wireless interfaces.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -37,34 +58,6 @@ in {
|
||||||
description = "Force a specific wpa_supplicant driver.";
|
description = "Force a specific wpa_supplicant driver.";
|
||||||
};
|
};
|
||||||
|
|
||||||
networks = mkOption {
|
|
||||||
type = types.attrsOf (types.submodule {
|
|
||||||
options = {
|
|
||||||
psk = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
The network's pre-shared key in plaintext defaulting
|
|
||||||
to being a network without any authentication.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
});
|
|
||||||
description = ''
|
|
||||||
The network definitions to automatically connect to when
|
|
||||||
<command>wpa_supplicant</command> is running. If this
|
|
||||||
parameter is left empty wpa_supplicant will use
|
|
||||||
/etc/wpa_supplicant.conf as the configuration file.
|
|
||||||
'';
|
|
||||||
default = {};
|
|
||||||
example = literalExample ''
|
|
||||||
echelon = {
|
|
||||||
psk = "abcdefgh";
|
|
||||||
};
|
|
||||||
"free.wifi" = {};
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
userControlled = {
|
userControlled = {
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
@ -75,8 +68,10 @@ in {
|
||||||
to depend on a large package such as NetworkManager just to pick nearby
|
to depend on a large package such as NetworkManager just to pick nearby
|
||||||
access points.
|
access points.
|
||||||
|
|
||||||
When using a declarative network specification you cannot persist any
|
When you want to use this, make sure ${configFile} doesn't exist.
|
||||||
settings via wpa_gui or wpa_cli.
|
It will be created for you.
|
||||||
|
|
||||||
|
Currently it is also necessary to explicitly specify networking.wireless.interfaces.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -90,49 +85,64 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
|
||||||
(mkIf cfg.enable {
|
|
||||||
environment.systemPackages = [ pkgs.wpa_supplicant ];
|
|
||||||
|
|
||||||
services.dbus.packages = [ pkgs.wpa_supplicant ];
|
###### implementation
|
||||||
|
|
||||||
# FIXME: start a separate wpa_supplicant instance per interface.
|
config = mkIf cfg.enable {
|
||||||
systemd.services.wpa_supplicant = let
|
|
||||||
ifaces = cfg.interfaces;
|
environment.systemPackages = [ pkgs.wpa_supplicant ];
|
||||||
in {
|
|
||||||
description = "WPA Supplicant";
|
services.dbus.packages = [ pkgs.wpa_supplicant ];
|
||||||
|
|
||||||
|
# FIXME: start a separate wpa_supplicant instance per interface.
|
||||||
|
jobs.wpa_supplicant =
|
||||||
|
{ description = "WPA Supplicant";
|
||||||
|
|
||||||
wantedBy = [ "network.target" ];
|
wantedBy = [ "network.target" ];
|
||||||
|
|
||||||
path = [ pkgs.wpa_supplicant ];
|
path = [ pkgs.wpa_supplicant ];
|
||||||
|
|
||||||
script = ''
|
preStart = ''
|
||||||
${if ifaces == [] then ''
|
touch -a ${configFile}
|
||||||
for i in $(cd /sys/class/net && echo *); do
|
chmod 600 ${configFile}
|
||||||
DEVTYPE=
|
'' + optionalString cfg.userControlled.enable ''
|
||||||
source /sys/class/net/$i/uevent
|
if [ ! -s ${configFile} ]; then
|
||||||
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
|
echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
|
||||||
ifaces="$ifaces''${ifaces:+ -N} -i$i"
|
echo "update_config=1" >> ${configFile}
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
'' else ''
|
|
||||||
ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
|
|
||||||
''}
|
|
||||||
exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
script =
|
||||||
|
''
|
||||||
|
${if ifaces == [] then ''
|
||||||
|
for i in $(cd /sys/class/net && echo *); do
|
||||||
|
DEVTYPE=
|
||||||
|
source /sys/class/net/$i/uevent
|
||||||
|
if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
|
||||||
|
ifaces="$ifaces''${ifaces:+ -N} -i$i"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'' else ''
|
||||||
|
ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
|
||||||
|
''}
|
||||||
|
exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
powerManagement.resumeCommands = ''
|
powerManagement.resumeCommands =
|
||||||
|
''
|
||||||
${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
|
${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Restart wpa_supplicant when a wlan device appears or disappears.
|
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
|
||||||
services.udev.extraRules = ''
|
message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
|
||||||
|
|
||||||
|
# Restart wpa_supplicant when a wlan device appears or disappears.
|
||||||
|
services.udev.extraRules =
|
||||||
|
''
|
||||||
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
|
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
|
||||||
'';
|
'';
|
||||||
})
|
|
||||||
{
|
};
|
||||||
meta.maintainers = with lib.maintainers; [ globin ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue