Merge pull request #15560 from peterhoeg/nm_dnsdhcp

nixos/networkmanager: tiny cleanups
This commit is contained in:
Peter Hoeg 2019-09-23 10:16:32 +08:00 committed by GitHub
commit 423eb16913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,6 +27,7 @@ let
[logging]
level=${cfg.logLevel}
audit=${lib.boolToString config.security.audit.enable}
[connection]
ipv6.ip6-privacy=2
@ -508,8 +509,9 @@ in {
security.polkit.extraConfig = polkitConf;
services.dbus.packages =
optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
services.dbus.packages = cfg.packages
++ optional cfg.enableStrongSwan pkgs.strongswanNM
++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
services.udev.packages = cfg.packages;
};