MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #59367 from Ma27/fix-hostapd-interface-naming

Browse source 
nixos/hostapd: escape interface names for hostapd
This commit is contained in:
Renaud 2019-05-03 19:04:00 +02:00 committed by GitHub
commit 966ee252c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/networking/hostapd.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, utils, ... }:
# TODO: # TODO:
# #
@ -12,6 +12,8 @@ let
cfg = config.services.hostapd; cfg = config.services.hostapd;
escapedInterface = utils.escapeSystemdPath cfg.interface;
configFile = pkgs.writeText "hostapd.conf" '' configFile = pkgs.writeText "hostapd.conf" ''
interface=${cfg.interface} interface=${cfg.interface}
driver=${cfg.driver} driver=${cfg.driver}
@ -157,8 +159,8 @@ in
{ description = "hostapd wireless AP"; { description = "hostapd wireless AP";
path = [ pkgs.hostapd ]; path = [ pkgs.hostapd ];
after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; after = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; bindsTo = [ "sys-subsystem-net-devices-${escapedInterface}.device" ];
requiredBy = [ "network-link-${cfg.interface}.service" ]; requiredBy = [ "network-link-${cfg.interface}.service" ];
serviceConfig = serviceConfig =