From 97ff64e35145c9365fdaf9b1d3729614d4205cae Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Feb 2020 00:28:32 +0100 Subject: [PATCH] nixos/resolvconf: Remove useHostResolvConf option Never had any effect --- nixos/modules/config/resolvconf.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 7d2f252a8886..cc202bca6c4e 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -38,6 +38,7 @@ in (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ]) (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ]) (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ]) + (mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways") ]; options = { @@ -53,15 +54,6 @@ in ''; }; - useHostResolvConf = mkOption { - type = types.bool; - default = false; - description = '' - In containers, whether to use the - resolv.conf supplied by the host. - ''; - }; - dnsSingleRequest = lib.mkOption { type = types.bool; default = false;