Merge pull request #15560 from peterhoeg/nm_dnsdhcp

nixos/networkmanager: tiny cleanups
2019-09-23 10:16:32 +08:00
parent ad22b9084d 1c7aaf227c
commit 423eb16913
1 changed files with 4 additions and 2 deletions
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -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;
  };