diff options
| author | jD91mZM2 <me@krake.one> | 2018-05-03 14:05:43 +0200 |
|---|---|---|
| committer | jD91mZM2 <me@krake.one> | 2018-05-08 13:42:39 +0200 |
| commit | 6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d (patch) | |
| tree | c735918c7d55769bb87f900cc103a61b52640778 /nixos | |
| parent | 9e968fb553b7bcf3130073b7d02ff8611fee39b8 (diff) | |
| download | nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar.gz nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar.bz2 nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar.lz nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar.xz nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.tar.zst nixlib-6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d.zip | |
NetworkManager: add noDns option
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 23 |
3 files changed, 22 insertions, 8 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 7259be4c904c..01b5e9d77460 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -227,6 +227,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' </para> </note> </listitem> + <listitem> + <para> + <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use + <literal>networking.networkmanager.dns</literal> instead. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a1ead80cc215..56b7bf00448c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,6 +17,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 10e96eb40362..f4c4adcaaeb8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -10,7 +10,8 @@ let stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; dns = - if cfg.useDnsmasq then "dnsmasq" + if cfg.dns == "none" then "none" + else if cfg.dns == "dnsmasq" then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" else if config.services.unbound.enable then "unbound" else "default"; @@ -205,14 +206,20 @@ in { }; }; - useDnsmasq = mkOption { - type = types.bool; - default = false; + dns = mkOption { + type = types.enum [ "auto" "dnsmasq" "none" ]; + default = "auto"; description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. + Options: + - auto: Check for systemd-resolved, unbound, or use default. + - dnsmasq: + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + - none: + Disable NetworkManager's DNS integration completely. + It will not touch your /etc/resolv.conf. ''; }; |