diff options
| author | Bryan Gardiner <bog@khumba.net> | 2015-08-26 12:17:08 -0700 |
|---|---|---|
| committer | Bryan Gardiner <bog@khumba.net> | 2015-09-07 14:04:32 -0700 |
| commit | f4de446573887d6241bbd64ad3e7a67c336a4aee (patch) | |
| tree | 24fc13a98b6f3d39435f8c50d455dfe027500bb0 /nixos/modules/services/networking/networkmanager.nix | |
| parent | d4f7bf9c2983bf1a793c0fd5b4ea82a04bb8efca (diff) | |
| download | nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar.gz nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar.bz2 nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar.lz nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar.xz nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.tar.zst nixpkgs-f4de446573887d6241bbd64ad3e7a67c336a4aee.zip | |
NetworkManager: fix dnsmasq interaction for ad-hoc networks
Fixes #7593 (NM can't find the dnsmasq binary); the NM expression is missing dnsmasq in its buildInputs, so configure can't find it. Also creates /var/lib/misc which dnsmasq expects to exist, because it puts dnsmasq.leases there.
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index adbc6099c95..c232bc3aaec 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,7 +6,8 @@ with lib; let cfg = config.networking.networkmanager; - stateDirs = "/var/lib/NetworkManager /var/lib/dhclient"; + # /var/lib/misc is for dnsmasq.leases. + stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; configFile = writeText "NetworkManager.conf" '' [main] |